Pcbnew: Redesign layer selection and layer pair selection (give them a look...

Pcbnew: Redesign layer selection and layer pair selection (give them a look near the Layer selector in toolbarr)

common/class_layer_box_selector.cpp

@@ -11,6 +11,46 @@
 
 #include <class_layer_box_selector.h>
 
+
+LAYER_SELECTOR::LAYER_SELECTOR()
+{
+    m_layerorder   = true;
+    m_layerhotkeys = true;
+    m_hotkeys      = NULL;
+}
+
+
+bool LAYER_SELECTOR::SetLayersOrdered( bool value )
+{
+    m_layerorder = value;
+    return m_layerorder;
+}
+
+
+bool LAYER_SELECTOR::SetLayersHotkeys( bool value )
+{
+    m_layerhotkeys = value;
+    return m_layerhotkeys;
+}
+
+
+void LAYER_SELECTOR::SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer )
+{
+    wxMemoryDC bmpDC;
+    wxBrush    brush;
+
+    // Prepare Bitmap
+    bmpDC.SelectObject( aLayerbmp );
+    brush.SetColour( MakeColour( GetLayerColor( aLayer ) ) );
+    brush.SetStyle( wxSOLID );
+
+    bmpDC.SetBrush( brush );
+    bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
+    bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+    bmpDC.SetPen( *wxBLACK_PEN );
+    bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
+}
+
 /* class to display a layer list.
  *
  */
@@ -18,12 +58,9 @@
 LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
                                         const wxPoint& pos, const wxSize& size,
                                         int n, const wxString choices[] ) :
+    LAYER_SELECTOR(),
     wxBitmapComboBox( parent, id, wxEmptyString, pos, size, n, choices, wxCB_READONLY )
 {
-    m_layerorder   = true;
-    m_layerhotkeys = true;
-    m_hotkeys      = NULL;
-
     if( choices != NULL )
         ResyncBitmapOnly();
 }
@@ -32,31 +69,14 @@ LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
 LAYER_BOX_SELECTOR::LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
                                         const wxPoint& pos, const wxSize& size,
                                         const wxArrayString& choices ) :
+    LAYER_SELECTOR(),
     wxBitmapComboBox( parent, id, wxEmptyString, pos, size, choices, wxCB_READONLY )
 {
-    m_layerorder   = true;
-    m_layerhotkeys = true;
-    m_hotkeys      = NULL;
-
     if( !choices.IsEmpty() )
         ResyncBitmapOnly();
 }
 
 
-bool LAYER_BOX_SELECTOR::SetLayersOrdered( bool value )
-{
-    m_layerorder = value;
-    return m_layerorder;
-}
-
-
-bool LAYER_BOX_SELECTOR::SetLayersHotkeys( bool value )
-{
-    m_layerhotkeys = value;
-    return m_layerhotkeys;
-}
-
-
 // Get Current Item #
 int LAYER_BOX_SELECTOR::GetChoice()
 {
@@ -104,21 +124,3 @@ void LAYER_BOX_SELECTOR::ResyncBitmapOnly()
         SetBitmapLayer( layerbmp, i );
     }
 }
-
-
-void LAYER_BOX_SELECTOR::SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer )
-{
-    wxMemoryDC bmpDC;
-    wxBrush    brush;
-
-    // Prepare Bitmap
-    bmpDC.SelectObject( aLayerbmp );
-    brush.SetColour( MakeColour( GetLayerColor( aLayer ) ) );
-    brush.SetStyle( wxSOLID );
-
-    bmpDC.SetBrush( brush );
-    bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
-    bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
-    bmpDC.SetPen( *wxBLACK_PEN );
-    bmpDC.DrawRectangle( 0, 0, aLayerbmp.GetWidth(), aLayerbmp.GetHeight() );
-}

include/class_layer_box_selector.h

@@ -9,11 +9,11 @@
 class wxAuiToolBar;
 
 
-/* class to display a layer list.
- *
+/* Basic class to build a layer list.
+ * this is an basic abstract class to build a layer list selector.
+ * To display this list, you should therefore derive this class
  */
-
-class LAYER_BOX_SELECTOR : public wxBitmapComboBox
+class LAYER_SELECTOR
 {
 protected:
     bool m_layerhotkeys;
@@ -24,14 +24,7 @@ public:
     struct EDA_HOTKEY_CONFIG* m_hotkeys;
 
 public:
-    LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        int n = 0, const wxString choices[] = NULL );
-
-    LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
-                        const wxPoint& pos, const wxSize& size,
-                        const wxArrayString& choices );
+    LAYER_SELECTOR();
 
     // Returns a color index from the layer id
     // Virtual function because GerbView uses its own functions in a derived class
@@ -45,7 +38,33 @@ public:
     // Virtual function pure because GerbView uses its own functions in a derived class
     virtual bool IsLayerEnabled( LAYER_NUM aLayer ) const = 0;
 
-   // Get Current Item #
+    bool SetLayersOrdered(bool value);
+    bool SetLayersHotkeys(bool value);
+
+protected:
+   // Fills the layer bitmap aLayerbmp with the layer color
+    void SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer );
+};
+
+/* class to display a layer list in a wxBitmapComboBox.
+ */
+class LAYER_BOX_SELECTOR : public LAYER_SELECTOR, public wxBitmapComboBox
+{
+public:
+    // Hotkey Info
+    struct EDA_HOTKEY_CONFIG* m_hotkeys;
+
+public:
+    LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
+                        const wxPoint& pos = wxDefaultPosition,
+                        const wxSize& size = wxDefaultSize,
+                        int n = 0, const wxString choices[] = NULL );
+
+    LAYER_BOX_SELECTOR( wxAuiToolBar* parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        const wxArrayString& choices );
+
+    // Get Current Item #
     int GetChoice();
 
     // Get Current Layer
@@ -60,13 +79,6 @@ public:
 
     // Reload the Layers bitmaps colors
     void ResyncBitmapOnly();
-
-    bool SetLayersOrdered(bool value);
-    bool SetLayersHotkeys(bool value);
-
-protected:
-   // Fills the layer bitmap aLayerbmp with the layer color
-    void SetBitmapLayer( wxBitmap& aLayerbmp, LAYER_NUM aLayer );
 };
 
 #define DECLARE_LAYERS_HOTKEY(list) int list[NB_LAYERS] = \

pagelayout_editor/files.cpp

@@ -186,9 +186,14 @@ void PL_EDITOR_FRAME::Files_io( wxCommandEvent& event )
 
         filename = openFileDialog.GetPath();
         // Ensure the file has the right extension:
+        // because a name like name.subname.subsubname is legal,
+        // add the right extension without replacing the wxFileName
+        // extension
         wxFileName fn(filename);
-        fn.SetExt( PageLayoutDescrFileExtension );
-        filename = fn.GetFullPath();
+
+        if( fn.GetExt() != PageLayoutDescrFileExtension )
+            filename << wxT(".") << PageLayoutDescrFileExtension;
+
         if( !SavePageLayoutDescrFile( filename ) )
         {
             wxString msg;

pcbnew/CMakeLists.txt

@@ -76,6 +76,7 @@ set( PCBNEW_DIALOGS
     dialogs/dialog_global_deletion_base.cpp
     dialogs/dialog_keepout_area_properties.cpp
     dialogs/dialog_keepout_area_properties_base.cpp
+    dialogs/dialog_layer_selection_base.cpp
     dialogs/dialog_layers_setup.cpp
     dialogs/dialog_layers_setup_base.cpp
     dialogs/dialog_netlist.cpp

pcbnew/edit.cpp

@@ -925,7 +925,15 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         itmp = SelectLayer( getActiveLayer(), UNDEFINED_LAYER, UNDEFINED_LAYER );
 
         if( itmp >= 0 )
+        {
+            // if user changed colors and we are in high contrast mode, then redraw
+            // because the PAD_SMD pads may change color.
+            if( DisplayOpt.ContrastModeDisplay && getActiveLayer() != itmp )
+            {
+                m_canvas->Refresh();
+            }
             setActiveLayer( itmp );
+        }
 
         m_canvas->MoveCursorToCrossHair();
         break;