From d0daa2cab708bf583a8bce7737920117be925e49 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 16 Jun 2015 20:04:02 +0200 Subject: [PATCH 1/4] Add color selector in 3D viewer for silkscreen, solder mask and copper. Remove unused or duplicate icons. --- 3d-viewer/3d_frame.cpp | 155 ++- 3d-viewer/3d_toolbar.cpp | 9 + 3d-viewer/3d_viewer.h | 33 +- 3d-viewer/3d_viewer_id.h | 3 + 3d-viewer/info3d_visu.cpp | 20 - bitmaps_png/CMakeLists.txt | 6 +- bitmaps_png/cpp_26/new.cpp | 61 -- bitmaps_png/cpp_26/new_txt.cpp | 89 -- bitmaps_png/sources/new.svg | 1053 ------------------- bitmaps_png/sources/new_txt.svg | 1237 ----------------------- bitmaps_png/sources/new_txt2.svg | 92 -- common/dialogs/wx_html_report_panel.cpp | 2 +- eeschema/menubar.cpp | 2 +- eeschema/tool_sch.cpp | 2 +- include/bitmaps.h | 6 +- 15 files changed, 205 insertions(+), 2565 deletions(-) delete mode 100644 bitmaps_png/cpp_26/new.cpp delete mode 100644 bitmaps_png/cpp_26/new_txt.cpp delete mode 100644 bitmaps_png/sources/new.svg delete mode 100644 bitmaps_png/sources/new_txt.svg delete mode 100644 bitmaps_png/sources/new_txt2.svg diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index d1f07c7211..7a243b34b4 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -46,9 +46,21 @@ static const wxChar keyBgColor_Red[] = wxT( "BgColor_Red" ); static const wxChar keyBgColor_Green[] = wxT( "BgColor_Green" ); static const wxChar keyBgColor_Blue[] = wxT( "BgColor_Blue" ); -static const wxChar keyBgColor_Red_Top[] = wxT( "BgColor_Red_Top" ); -static const wxChar keyBgColor_Green_Top[] = wxT( "BgColor_Green_Top" ); -static const wxChar keyBgColor_Blue_Top[] = wxT( "BgColor_Blue_Top" ); +static const wxChar keyBgColor_Red_Top[] = wxT( "BgColor_Red_Top" ); +static const wxChar keyBgColor_Green_Top[] = wxT( "BgColor_Green_Top" ); +static const wxChar keyBgColor_Blue_Top[] = wxT( "BgColor_Blue_Top" ); + +static const wxChar keySMaskColor_Red[] = wxT( "SMaskColor_Red" ); +static const wxChar keySMaskColor_Green[] = wxT( "SMaskColor_Green" ); +static const wxChar keySMaskColor_Blue[] = wxT( "SMaskColor_Blue" ); + +static const wxChar keySilkColor_Red[] = wxT( "SilkColor_Red" ); +static const wxChar keySilkColor_Green[] = wxT( "SilkColor_Green" ); +static const wxChar keySilkColor_Blue[] = wxT( "SilkColor_Blue" ); + +static const wxChar keyCopperColor_Red[] = wxT( "CopperColor_Red" ); +static const wxChar keyCopperColor_Green[] = wxT( "CopperColor_Green" ); +static const wxChar keyCopperColor_Blue[] = wxT( "CopperColor_Blue" ); static const wxChar keyShowRealisticMode[] = wxT( "ShowRealisticMode" ); static const wxChar keyRenderShadows[] = wxT( "Render_Shadows" ); @@ -236,6 +248,18 @@ void EDA_3D_FRAME::LoadSettings( wxConfigBase* aCfg ) aCfg->Read( keyBgColor_Green_Top, &GetPrm3DVisu().m_BgColor_Top.m_Green, 0.8 ); aCfg->Read( keyBgColor_Blue_Top, &GetPrm3DVisu().m_BgColor_Top.m_Blue, 0.9 ); + aCfg->Read( keySMaskColor_Red, &GetPrm3DVisu().m_SolderMaskColor.m_Red, 100.0*(0.2/255.0) ); + aCfg->Read( keySMaskColor_Green, &GetPrm3DVisu().m_SolderMaskColor.m_Green, 255.0*(0.2/255.0) ); + aCfg->Read( keySMaskColor_Blue, &GetPrm3DVisu().m_SolderMaskColor.m_Blue, 180.0*(0.2/255.0) ); + + aCfg->Read( keySilkColor_Red, &GetPrm3DVisu().m_SilkScreenColor.m_Red, 0.9 ); + aCfg->Read( keySilkColor_Green, &GetPrm3DVisu().m_SilkScreenColor.m_Green, 0.9 ); + aCfg->Read( keySilkColor_Blue, &GetPrm3DVisu().m_SilkScreenColor.m_Blue, 0.9 ); + + aCfg->Read( keyCopperColor_Red, &GetPrm3DVisu().m_CopperColor.m_Red, 255.0*(0.7/255.0) ); + aCfg->Read( keyCopperColor_Green, &GetPrm3DVisu().m_CopperColor.m_Green, 223.0*(0.7/255.0) ); + aCfg->Read( keyCopperColor_Blue, &GetPrm3DVisu().m_CopperColor.m_Blue, 0.0*(0.7/255.0) ); + bool tmp; aCfg->Read( keyShowRealisticMode, &tmp, false ); prms.SetFlag( FL_USE_REALISTIC_MODE, tmp ); @@ -315,6 +339,18 @@ void EDA_3D_FRAME::SaveSettings( wxConfigBase* aCfg ) aCfg->Write( keyBgColor_Green_Top, GetPrm3DVisu().m_BgColor_Top.m_Green ); aCfg->Write( keyBgColor_Blue_Top, GetPrm3DVisu().m_BgColor_Top.m_Blue ); + aCfg->Write( keySMaskColor_Red, GetPrm3DVisu().m_SolderMaskColor.m_Red ); + aCfg->Write( keySMaskColor_Green, GetPrm3DVisu().m_SolderMaskColor.m_Green ); + aCfg->Write( keySMaskColor_Blue, GetPrm3DVisu().m_SolderMaskColor.m_Blue ); + + aCfg->Write( keySilkColor_Red, GetPrm3DVisu().m_SilkScreenColor.m_Red ); + aCfg->Write( keySilkColor_Green, GetPrm3DVisu().m_SilkScreenColor.m_Green ); + aCfg->Write( keySilkColor_Blue, GetPrm3DVisu().m_SilkScreenColor.m_Blue ); + + aCfg->Write( keyCopperColor_Red, GetPrm3DVisu().m_CopperColor.m_Red ); + aCfg->Write( keyCopperColor_Green, GetPrm3DVisu().m_CopperColor.m_Green ); + aCfg->Write( keyCopperColor_Blue, GetPrm3DVisu().m_CopperColor.m_Blue ); + aCfg->Write( keyShowRealisticMode, prms.GetFlag( FL_USE_REALISTIC_MODE ) ); aCfg->Write( keyRenderShadows, prms.GetFlag( FL_RENDER_SHADOWS ) ); @@ -478,6 +514,18 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event ) Get3DColorFromUser( GetPrm3DVisu().m_BgColor_Top ); return; + case ID_MENU3D_SILKSCREEN_COLOR_SELECTION: + Set3DSilkScreenColorFromUser(); + return; + + case ID_MENU3D_SOLDERMASK_COLOR_SELECTION: + Set3DSoldermaskColorFromUser(); + return; + + case ID_MENU3D_COPPER_COLOR_SELECTION: + Set3DCopperColorFromUser(); + break;; + case ID_MENU3D_REALISTIC_MODE: GetPrm3DVisu().SetFlag( FL_USE_REALISTIC_MODE, isChecked ); NewDisplay(); @@ -683,6 +731,107 @@ bool EDA_3D_FRAME::Get3DColorFromUser( S3D_COLOR &color ) return true; } +/* called to set the silkscreen color. Sets up a number of default colors + */ +bool EDA_3D_FRAME::Set3DSilkScreenColorFromUser() +{ + S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SilkScreenColor; + wxColour oldcolor; + oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), + KiROUND( curr_3Dcolor.m_Green * 255 ), + KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + + wxColourData colorData; + + colorData.SetCustomColour(0, wxColour(241, 241, 241)); // White + colorData.SetCustomColour(1, wxColour(180, 180, 180 )); // Gray + + wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); + + if( !newcolor.IsOk() ) // Cancel command + return false; + + if( newcolor != oldcolor ) + { + curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; + curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; + curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + NewDisplay(GL_ID_TECH_LAYERS); + } + + return true; +} + + +/* called to set the soldermask color. Sets up a number of default colors + */ +bool EDA_3D_FRAME::Set3DSoldermaskColorFromUser() +{ + S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SolderMaskColor; + wxColour oldcolor; + oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), + KiROUND( curr_3Dcolor.m_Green * 255 ), + KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + + wxColourData colorData; + + colorData.SetCustomColour(0, wxColour(20, 51, 36 )); // Green + colorData.SetCustomColour(1, wxColour(43, 10, 65 )); // Purple + colorData.SetCustomColour(2, wxColour(117, 19, 21 )); // Red + colorData.SetCustomColour(3, wxColour(54, 79, 116)); // Light blue + colorData.SetCustomColour(4, wxColour(11, 11, 11 )); // Black + colorData.SetCustomColour(5, wxColour(241, 241,241)); // White + + wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); + + if( !newcolor.IsOk() ) // Cancel command + return false; + + if( newcolor != oldcolor ) + { + curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; + curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; + curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + NewDisplay(GL_ID_TECH_LAYERS); + } + + return true; +} + + +/* called to set the copper surface color. Sets up a number of default colors + */ +bool EDA_3D_FRAME::Set3DCopperColorFromUser() +{ + S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_CopperColor; + wxColour oldcolor; + oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), + KiROUND( curr_3Dcolor.m_Green * 255 ), + KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + + wxColourData colorData; + + colorData.SetCustomColour(0, wxColour(255, 223, 0 )); // Copper + colorData.SetCustomColour(1, wxColour(233, 221, 82 )); // Gold + colorData.SetCustomColour(2, wxColour(213, 213, 213)); // Silver + + wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); + + if( !newcolor.IsOk() ) // Cancel command + return false; + + if( newcolor != oldcolor ) + { + curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; + curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; + curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + NewDisplay(GL_ID_TECH_LAYERS); + } + + return true; +} + + BOARD* EDA_3D_FRAME::GetBoard() { return Parent()->GetBoard(); diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 9200ca0ea2..138962f6a3 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -198,6 +198,15 @@ void EDA_3D_FRAME::CreateMenuBar() AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION, _( "Background Bottom Color" ), KiBitmap( palette_xpm ) ); + AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, + _( "Silkscreen Color" ), KiBitmap( palette_xpm ) ); + + AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, + _( "Solder Mask Color" ), KiBitmap( palette_xpm ) ); + + AddMenuItem( backgrounColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, + _( "Copper/Surface Finish Color" ), KiBitmap( palette_xpm ) ); + AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF, _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK ); diff --git a/3d-viewer/3d_viewer.h b/3d-viewer/3d_viewer.h index bf19745a01..f0722fc974 100644 --- a/3d-viewer/3d_viewer.h +++ b/3d-viewer/3d_viewer.h @@ -145,11 +145,38 @@ private: double BestZoom(); void RedrawActiveWindow( wxDC* DC, bool EraseBg ); - // Get a S3D_COLOR from a wx colour dialog - // return true if a new color is chosen, false if - // no change or aborted by user + /** + * Function Get3DColorFromUser + * Get a S3D_COLOR from a wx colour dialog + * @return true if a new color is chosen, false if + * no change or aborted by user + */ bool Get3DColorFromUser( S3D_COLOR &color ); + /** + * Function Set3DSoldermaskColorFromUser + * Set the solder mask color from a set of colors + * @return true if a new color is chosen, false if + * no change or aborted by user + */ + bool Set3DSoldermaskColorFromUser(); + + /** + * Function Set3DCopperColorFromUser + * Set the copper color from a set of colors + * @return true if a new color is chosen, false if + * no change or aborted by user + */ + bool Set3DCopperColorFromUser(); + + /** + * Function Set3DSilkScreenColorFromUser + * Set the silkscreen color from a set of colors + * @return true if a new color is chosen, false if + * no change or aborted by user + */ + bool Set3DSilkScreenColorFromUser(); + DECLARE_EVENT_TABLE() }; diff --git a/3d-viewer/3d_viewer_id.h b/3d-viewer/3d_viewer_id.h index 522675e601..75c4c3f0f0 100644 --- a/3d-viewer/3d_viewer_id.h +++ b/3d-viewer/3d_viewer_id.h @@ -33,6 +33,9 @@ enum id_3dview_frm ID_MENU3D_COLOR, ID_MENU3D_BGCOLOR_SELECTION, ID_MENU3D_BGCOLOR_TOP_SELECTION, + ID_MENU3D_SILKSCREEN_COLOR_SELECTION, + ID_MENU3D_SOLDERMASK_COLOR_SELECTION, + ID_MENU3D_COPPER_COLOR_SELECTION, ID_MENU3D_USE_COPPER_THICKNESS, ID_MENU3D_AXIS_ONOFF, ID_MENU3D_MODULE_ONOFF, diff --git a/3d-viewer/info3d_visu.cpp b/3d-viewer/info3d_visu.cpp index f140ced0c3..60e69d3276 100644 --- a/3d-viewer/info3d_visu.cpp +++ b/3d-viewer/info3d_visu.cpp @@ -68,26 +68,6 @@ INFO3D_VISU::INFO3D_VISU() m_BiuTo3Dunits = 1.0; zpos_offset = 0.0; - // Set copper color, in realistic mode - #define LUMINANCE 0.7/255.0 - m_CopperColor.m_Red = 255.0*LUMINANCE; - m_CopperColor.m_Green = 223.0*LUMINANCE; - m_CopperColor.m_Blue = 0.0*LUMINANCE; - - // Set the solder mask color, in realistic mode - #undef LUMINANCE - #define LUMINANCE 0.2/255.0 - m_SolderMaskColor.m_Red = 100.0*LUMINANCE; - m_SolderMaskColor.m_Green = 255.0*LUMINANCE; - m_SolderMaskColor.m_Blue = 180.0*LUMINANCE; - - // Set the silk screen mask color, in realistic mode - #undef LUMINANCE - #define LUMINANCE 0.9 - m_SilkScreenColor.m_Red = 1.0*LUMINANCE; - m_SilkScreenColor.m_Green = 1.0*LUMINANCE; - m_SilkScreenColor.m_Blue = 1.0*LUMINANCE; - // Set the body board (FR4) color, in realistic mode #undef LUMINANCE #define LUMINANCE 0.2/255.0 diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 28f2c943c2..644968646d 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -400,8 +400,6 @@ set( BMAPS_MID new_project new_project_with_template new_sch - new_txt - new noconn normal online_help @@ -508,6 +506,10 @@ set( BMAPS_MID select_w_layer shape_3d sheetset + setcolor_3d_bg + setcolor_silkscreen + setcolor_soldermask + setcolor_copper show_dcodenumber show_footprint show_mod_edge diff --git a/bitmaps_png/cpp_26/new.cpp b/bitmaps_png/cpp_26/new.cpp deleted file mode 100644 index 559ad2ef9c..0000000000 --- a/bitmaps_png/cpp_26/new.cpp +++ /dev/null @@ -1,61 +0,0 @@ - -/* Do not modify this file, it was automatically generated by the - * PNG2cpp CMake script, using a *.png file as input. - */ - -#include - -static const unsigned char png[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x02, 0xbc, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0xb1, 0x6e, 0x1b, - 0x47, 0x10, 0x86, 0xbf, 0x99, 0x3b, 0x16, 0x76, 0xc3, 0xe8, 0x00, 0x35, 0x24, 0x61, 0x50, 0x4f, - 0xe2, 0x56, 0x2f, 0xa1, 0x57, 0x48, 0xa0, 0x52, 0x11, 0x54, 0x07, 0x10, 0x90, 0x56, 0xb0, 0xe1, - 0xca, 0xae, 0xf8, 0x00, 0x2e, 0xd9, 0xa4, 0x15, 0x60, 0x40, 0x10, 0xd2, 0xa4, 0x10, 0xa1, 0x44, - 0xe1, 0x11, 0x48, 0x63, 0x8b, 0x80, 0x62, 0x92, 0xb7, 0xb7, 0xeb, 0xc2, 0xdc, 0xe3, 0xde, 0xf2, - 0x8e, 0xb4, 0x81, 0x64, 0x81, 0xc5, 0xce, 0x2d, 0xee, 0xf6, 0x9f, 0x6f, 0x66, 0x67, 0x70, 0x02, - 0x0c, 0x81, 0x01, 0x90, 0xf2, 0xff, 0x0c, 0x03, 0xfc, 0x9d, 0x02, 0x2f, 0x3e, 0x7e, 0xfc, 0xf4, - 0x9b, 0x31, 0x06, 0x51, 0x41, 0x64, 0x3d, 0x01, 0xc2, 0x55, 0x04, 0xe0, 0xeb, 0xf3, 0x7a, 0xaf, - 0x7a, 0x16, 0x69, 0x55, 0x49, 0x92, 0x84, 0xe7, 0xcf, 0x9e, 0xbd, 0x4c, 0x01, 0x2d, 0x8a, 0x15, - 0x77, 0x77, 0x13, 0x86, 0x47, 0x47, 0xa8, 0x2a, 0xaa, 0xeb, 0x43, 0x62, 0x51, 0xd9, 0xec, 0xe3, - 0x1c, 0x02, 0xb8, 0xc0, 0xa6, 0x41, 0xd4, 0x59, 0x0b, 0xa0, 0x29, 0x80, 0x26, 0x09, 0xfd, 0x7e, - 0x8f, 0x24, 0xd1, 0xcd, 0xe1, 0x91, 0xc0, 0x16, 0x61, 0xb8, 0xc6, 0x84, 0xc1, 0xf0, 0xce, 0xa9, - 0xdf, 0xc8, 0xf3, 0xbc, 0x4e, 0x21, 0x82, 0xa8, 0xa2, 0xb1, 0xdd, 0xb4, 0xae, 0xed, 0xf0, 0xdd, - 0x6a, 0xae, 0x85, 0x52, 0x1f, 0xc7, 0xfe, 0x60, 0x40, 0x92, 0x24, 0x88, 0xf7, 0xe2, 0x7b, 0xc8, - 0x62, 0x3b, 0x18, 0xaa, 0x1a, 0x10, 0x39, 0x47, 0x3e, 0x9d, 0x7e, 0x7d, 0x7f, 0xed, 0x85, 0x36, - 0x90, 0x35, 0x12, 0x89, 0x54, 0x44, 0xb2, 0x8f, 0x48, 0x54, 0xe9, 0xf7, 0xfb, 0xa8, 0x6a, 0x8d, - 0xc2, 0xdb, 0x44, 0x7b, 0xec, 0x58, 0xd9, 0x9b, 0xa3, 0xd9, 0xac, 0x9e, 0xa3, 0x40, 0x54, 0x23, - 0x42, 0xef, 0x50, 0xe8, 0xd8, 0x56, 0x7e, 0x83, 0x59, 0x11, 0xa9, 0x2a, 0xfd, 0x5e, 0xaf, 0x4e, - 0x14, 0x51, 0xc5, 0x07, 0xee, 0xa2, 0x68, 0x1a, 0x7b, 0x6f, 0x5d, 0x9b, 0x97, 0xfb, 0x28, 0x9a, - 0x89, 0x44, 0xb6, 0x73, 0xd4, 0x42, 0x16, 0xc7, 0xbe, 0xed, 0xb9, 0x91, 0xc8, 0x39, 0xc7, 0x74, - 0x3a, 0xad, 0x2a, 0x3c, 0x14, 0xd1, 0x16, 0x82, 0x98, 0x26, 0x14, 0x6c, 0x25, 0x12, 0x55, 0x06, - 0x83, 0xc1, 0x86, 0x68, 0x5d, 0xe1, 0x12, 0x79, 0xdb, 0x46, 0xf4, 0x2d, 0xb9, 0xaa, 0x72, 0x34, - 0xf5, 0x75, 0xb4, 0x23, 0x17, 0x6d, 0x44, 0x6d, 0x74, 0xe1, 0x77, 0xb5, 0x1c, 0x35, 0x25, 0x7f, - 0x5f, 0xcd, 0x78, 0xdb, 0x5a, 0x8b, 0x73, 0x0e, 0xe7, 0x1c, 0x3e, 0x1d, 0x5b, 0xa1, 0x73, 0xeb, - 0x5b, 0xd7, 0xed, 0x76, 0x6b, 0x5d, 0xba, 0xc9, 0xb3, 0x78, 0xb5, 0xd6, 0x6e, 0x4d, 0x2f, 0x06, - 0x90, 0xa6, 0x69, 0x9d, 0xa8, 0x17, 0xdc, 0xba, 0x7d, 0xb5, 0xe2, 0xf7, 0xca, 0xb2, 0xc4, 0x5a, - 0x4b, 0x59, 0x96, 0x18, 0x63, 0xb6, 0xc4, 0x54, 0x95, 0xc5, 0x62, 0x61, 0x00, 0x57, 0x11, 0xcd, - 0xf2, 0x9c, 0x1f, 0xba, 0xdd, 0xc6, 0xb0, 0x34, 0x89, 0xfa, 0x03, 0x8b, 0xa2, 0xc0, 0x18, 0xc3, - 0x6a, 0xb5, 0x62, 0xb1, 0x58, 0xb0, 0x5c, 0x2e, 0x29, 0x8a, 0x82, 0x4e, 0xa7, 0x83, 0xb5, 0xd6, - 0x5e, 0x5d, 0x5d, 0xbd, 0x03, 0xe6, 0x1b, 0xa2, 0xa8, 0x33, 0xec, 0x0a, 0x9d, 0x17, 0x31, 0xc6, - 0x60, 0x8c, 0xe1, 0xe9, 0xe9, 0x89, 0x9b, 0x9b, 0x1b, 0x44, 0x84, 0x2c, 0xcb, 0xc8, 0xb2, 0x8c, - 0xf9, 0x7c, 0xee, 0x2e, 0x2f, 0x2f, 0x5f, 0x8d, 0x46, 0xa3, 0xb7, 0xc0, 0x1f, 0x55, 0x1d, 0xe5, - 0x79, 0x5e, 0x8b, 0xed, 0xae, 0xab, 0xeb, 0x9c, 0xa3, 0x2c, 0xcb, 0x2a, 0x64, 0x45, 0x51, 0x20, - 0x22, 0x1c, 0x1f, 0x1f, 0x33, 0x1c, 0x0e, 0x79, 0x7c, 0x7c, 0x74, 0x17, 0x17, 0x17, 0xbf, 0x8e, - 0x46, 0xa3, 0xd7, 0xc0, 0x2d, 0xf0, 0x39, 0xf5, 0x87, 0xf5, 0x7a, 0xbd, 0xbd, 0xf5, 0x20, 0x22, - 0xd5, 0xcd, 0xf2, 0xb9, 0x29, 0xcb, 0x92, 0xe5, 0x6a, 0xc5, 0xc1, 0xc1, 0x01, 0xb3, 0xd9, 0x8c, - 0x87, 0x87, 0x07, 0x7b, 0x7e, 0x7e, 0xfe, 0xcb, 0x78, 0x3c, 0x7e, 0x07, 0xfc, 0xe9, 0x9c, 0x5b, - 0xd6, 0x3a, 0x43, 0x4c, 0xb4, 0x4b, 0xd4, 0x8b, 0x79, 0xb2, 0xe5, 0x62, 0xc1, 0xe1, 0xe1, 0x21, - 0x93, 0xc9, 0xc4, 0x9c, 0x9e, 0x9e, 0xfe, 0x3c, 0x1e, 0x8f, 0xdf, 0x00, 0x13, 0x2f, 0xb2, 0xe9, - 0x0c, 0xdf, 0x48, 0xe4, 0x45, 0x42, 0xb1, 0xb2, 0x2c, 0x49, 0x92, 0x84, 0xfb, 0xfb, 0xfb, 0xf9, - 0xd9, 0xd9, 0xd9, 0x8f, 0xd7, 0xd7, 0xd7, 0xef, 0x81, 0x4f, 0xce, 0xb9, 0x32, 0xfc, 0x2e, 0x05, - 0xac, 0x26, 0x09, 0x59, 0x96, 0xed, 0xec, 0x02, 0x71, 0x2f, 0x4b, 0xd3, 0x14, 0xe7, 0x1c, 0x69, - 0xa7, 0x63, 0x6e, 0x6f, 0x6f, 0x3f, 0x9c, 0x9c, 0x9c, 0xfc, 0x54, 0x14, 0xc5, 0xef, 0xc0, 0xbf, - 0xae, 0x21, 0xd9, 0xf2, 0x1f, 0xfc, 0x40, 0x16, 0xc0, 0x5f, 0xc0, 0x3f, 0x61, 0xa8, 0xe2, 0xf1, - 0x05, 0x95, 0x9b, 0x4e, 0x78, 0x5f, 0x66, 0xb8, 0x85, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82, -}; - -const BITMAP_OPAQUE new_xpm[1] = {{ png, sizeof( png ), "new_xpm" }}; - -//EOF diff --git a/bitmaps_png/cpp_26/new_txt.cpp b/bitmaps_png/cpp_26/new_txt.cpp deleted file mode 100644 index a18ccbd1ff..0000000000 --- a/bitmaps_png/cpp_26/new_txt.cpp +++ /dev/null @@ -1,89 +0,0 @@ - -/* Do not modify this file, it was automatically generated by the - * PNG2cpp CMake script, using a *.png file as input. - */ - -#include - -static const unsigned char png[] = { - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x04, 0x79, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5d, 0x4c, 0x5b, - 0x65, 0x18, 0xc7, 0x6b, 0x94, 0x68, 0xe6, 0xa5, 0xd7, 0x46, 0xaf, 0xbc, 0xd4, 0xa9, 0xb1, 0x33, - 0x8c, 0x6c, 0x35, 0x63, 0x31, 0x8e, 0x18, 0x97, 0x45, 0x91, 0x44, 0x84, 0xc4, 0x0b, 0x63, 0x8c, - 0x17, 0x78, 0xb1, 0x2c, 0x71, 0x43, 0x67, 0x30, 0x06, 0x87, 0x3a, 0x22, 0x22, 0x31, 0xdd, 0xc0, - 0x8f, 0xa9, 0x2c, 0x02, 0x41, 0x5d, 0x8a, 0xce, 0x91, 0x99, 0x8c, 0x04, 0x2a, 0x1f, 0x66, 0x23, - 0x50, 0xd6, 0x16, 0x3b, 0x5a, 0xe8, 0x77, 0x7b, 0x5a, 0xfa, 0xfd, 0x41, 0xff, 0x3e, 0xcf, 0xdb, - 0xf3, 0x1e, 0x4e, 0xbb, 0xd6, 0x5d, 0x18, 0x4f, 0xf2, 0x4f, 0xe9, 0xe1, 0xf0, 0xfc, 0xde, 0xff, - 0xff, 0x79, 0xde, 0xf7, 0x60, 0x30, 0x18, 0x0c, 0x0f, 0x93, 0x9a, 0x48, 0xa6, 0xff, 0x49, 0x4d, - 0x2a, 0xc3, 0x70, 0x40, 0x51, 0x62, 0x08, 0x85, 0xc2, 0x08, 0x47, 0x22, 0x88, 0x44, 0xa3, 0x88, - 0x2a, 0x0a, 0x14, 0x56, 0x2c, 0x86, 0x18, 0x2b, 0x1e, 0x47, 0x7c, 0x7b, 0x5b, 0x68, 0x5b, 0x2a, - 0x91, 0x10, 0x4a, 0xb0, 0x92, 0xc9, 0xba, 0x4a, 0x67, 0x32, 0x60, 0x06, 0x83, 0x4c, 0xc1, 0x60, - 0x10, 0xb3, 0xb3, 0x73, 0xf0, 0xf9, 0x03, 0x08, 0x04, 0x43, 0x08, 0x85, 0xc3, 0x42, 0x1a, 0x58, - 0xc2, 0x09, 0xaa, 0xa8, 0x60, 0x01, 0xff, 0x97, 0x05, 0x48, 0xa5, 0x52, 0x29, 0xa8, 0xce, 0x0c, - 0x26, 0x2e, 0xe8, 0x76, 0xbb, 0x11, 0x0c, 0x85, 0xea, 0x02, 0x34, 0x67, 0x6a, 0x71, 0x59, 0x34, - 0xa1, 0x2a, 0x3e, 0xf5, 0x0b, 0x62, 0x17, 0x2e, 0x20, 0xe9, 0xf5, 0x22, 0x49, 0x4e, 0xa4, 0xd2, - 0xe9, 0x74, 0x25, 0x68, 0x6e, 0x6e, 0x4e, 0x80, 0x2a, 0xe2, 0xab, 0x8a, 0xae, 0xa2, 0xb8, 0x5a, - 0x88, 0xc1, 0xb6, 0xd7, 0x5b, 0xe1, 0x6c, 0x6f, 0x43, 0xb8, 0xbb, 0x1b, 0x4a, 0xeb, 0x8b, 0x48, - 0x51, 0x42, 0x29, 0x02, 0xb0, 0x32, 0xe5, 0xe8, 0xca, 0x20, 0x2e, 0xe8, 0xd9, 0xdc, 0xd4, 0x5c, - 0x68, 0xfd, 0xa9, 0x06, 0xc8, 0x95, 0x52, 0x1c, 0x1c, 0x49, 0x54, 0x89, 0xe0, 0xfb, 0x81, 0x0f, - 0x71, 0x65, 0x72, 0x0c, 0x3f, 0x9c, 0xed, 0x83, 0xb5, 0xa7, 0x07, 0xee, 0xb6, 0x63, 0x48, 0xaf, - 0xad, 0x09, 0x00, 0x2b, 0x97, 0xcb, 0xe9, 0x40, 0x54, 0xd8, 0x6a, 0xb5, 0x0a, 0x90, 0x74, 0xa1, - 0x45, 0xa4, 0x03, 0x70, 0x71, 0x5e, 0x25, 0xc7, 0x91, 0x8c, 0x47, 0xa8, 0xf8, 0x71, 0x8c, 0x5f, - 0x1c, 0xc1, 0xf2, 0x8d, 0xeb, 0x18, 0x18, 0x18, 0xc0, 0xf0, 0xc9, 0x13, 0xd8, 0x3c, 0x62, 0x44, - 0x96, 0x00, 0x59, 0x02, 0xb0, 0xf2, 0xf9, 0xfc, 0x2e, 0x88, 0x57, 0xbe, 0x49, 0x8e, 0xaa, 0x5d, - 0x70, 0x44, 0x9a, 0x03, 0x15, 0xc0, 0xab, 0x4c, 0x06, 0x36, 0xe0, 0xfa, 0xf8, 0x19, 0x64, 0x2c, - 0x1d, 0x50, 0x26, 0x9e, 0xc7, 0xc8, 0xa7, 0xc7, 0x31, 0x34, 0xd8, 0x8f, 0xf1, 0xd3, 0x6f, 0x23, - 0x97, 0x49, 0x89, 0xe2, 0x52, 0x85, 0x42, 0xa1, 0x12, 0xf4, 0xe7, 0xfc, 0xbc, 0x00, 0xd5, 0x72, - 0x21, 0x01, 0xac, 0xf8, 0xad, 0xeb, 0x70, 0x9d, 0x69, 0x42, 0xee, 0xd7, 0x0e, 0xe4, 0xc7, 0x4d, - 0x88, 0x9c, 0x3b, 0x88, 0x2b, 0x67, 0x5e, 0xc1, 0xf8, 0xe7, 0xdd, 0xa2, 0x68, 0xb5, 0x8a, 0xc5, - 0xe2, 0x2e, 0x88, 0x0b, 0x6f, 0x6d, 0x6d, 0x55, 0x42, 0xd4, 0x3e, 0x48, 0x48, 0x36, 0x9b, 0x85, - 0x72, 0xe3, 0x32, 0xdc, 0x67, 0x4d, 0x28, 0xfc, 0xde, 0x81, 0xec, 0x68, 0x23, 0xc2, 0xe7, 0x0f, - 0xc1, 0xd1, 0x63, 0x84, 0xe7, 0xa7, 0x8f, 0x6a, 0x42, 0x6a, 0x82, 0xe6, 0xc9, 0x11, 0x83, 0x12, - 0xfa, 0xa8, 0x54, 0x17, 0x0c, 0x09, 0xfe, 0x61, 0x86, 0x6f, 0xe8, 0x59, 0x14, 0x2f, 0xb7, 0x23, - 0xfd, 0xdd, 0x3e, 0x04, 0xcd, 0x87, 0x71, 0xf3, 0xdd, 0x27, 0x10, 0xb1, 0x8e, 0x89, 0x62, 0xf5, - 0xb4, 0xb3, 0xb3, 0xb3, 0x0b, 0xe2, 0x88, 0xbc, 0x34, 0xff, 0xb7, 0x41, 0x08, 0xc0, 0x0d, 0xf5, - 0x8e, 0xbd, 0x83, 0xe0, 0x57, 0x47, 0x51, 0xfc, 0xed, 0x25, 0x24, 0xbf, 0x7e, 0x0a, 0xfe, 0x2f, - 0x09, 0x72, 0xea, 0x31, 0x24, 0x9c, 0xd6, 0x8a, 0x82, 0xf5, 0xa4, 0x81, 0x12, 0xaa, 0xa3, 0x84, - 0xba, 0x93, 0x25, 0x24, 0x93, 0x49, 0xc3, 0x6d, 0xee, 0x44, 0xec, 0xe2, 0xcb, 0x28, 0x5a, 0x5e, - 0x40, 0x7c, 0xc4, 0x08, 0xef, 0xe0, 0x21, 0xd8, 0x4e, 0xed, 0x45, 0x3a, 0xe0, 0xaa, 0x59, 0xb4, - 0x54, 0x2a, 0xdd, 0xa6, 0x5d, 0x47, 0x54, 0xdc, 0xe7, 0xf3, 0x55, 0xf4, 0x24, 0xbd, 0x1d, 0x85, - 0xab, 0xbf, 0x05, 0xa9, 0xc9, 0x76, 0x14, 0x2f, 0x3d, 0x87, 0xd8, 0x39, 0xea, 0x45, 0xbf, 0x09, - 0x37, 0xdf, 0x6f, 0x44, 0x6e, 0x3b, 0x72, 0xc7, 0xe2, 0x75, 0x41, 0x0b, 0x0b, 0x0b, 0x02, 0xc4, - 0x90, 0x54, 0xc8, 0x83, 0xbf, 0xfb, 0xca, 0xe3, 0x5b, 0xfc, 0xf9, 0x30, 0xa2, 0xe6, 0xa7, 0x71, - 0xeb, 0x13, 0x13, 0x1c, 0x7d, 0x47, 0x50, 0xc8, 0x65, 0xc4, 0xd8, 0x72, 0x5c, 0xfa, 0x62, 0xfa, - 0xab, 0xfa, 0xbe, 0x06, 0x62, 0x17, 0xec, 0x28, 0xad, 0x36, 0xde, 0x3b, 0xf1, 0x26, 0x0a, 0xce, - 0x49, 0xe4, 0x2f, 0x1d, 0x45, 0xc4, 0xbc, 0x1f, 0xeb, 0xbd, 0x4d, 0xb0, 0x7f, 0xd1, 0x29, 0xf6, - 0x1a, 0xf7, 0x92, 0x37, 0x33, 0x4f, 0x94, 0x1e, 0xc0, 0xce, 0x18, 0x2e, 0xa7, 0x4d, 0xee, 0xa1, - 0x8a, 0xa9, 0xe3, 0xe6, 0x2f, 0x2e, 0x2e, 0x96, 0x63, 0x8b, 0x07, 0x10, 0xbe, 0xda, 0x83, 0x5c, - 0x78, 0x0d, 0xb1, 0x6b, 0xbd, 0x58, 0x7b, 0xef, 0x49, 0xcc, 0x7e, 0xf6, 0x86, 0x38, 0x39, 0x96, - 0x97, 0x97, 0xe1, 0x72, 0xb9, 0xc0, 0xa7, 0x3d, 0x3f, 0xcb, 0xc7, 0x8b, 0x54, 0x56, 0xf4, 0x34, - 0x23, 0x52, 0xd1, 0x1f, 0xaa, 0x7c, 0x5f, 0x03, 0xf1, 0x03, 0x3e, 0xbf, 0x5f, 0xdc, 0x3c, 0xf9, - 0x56, 0x2b, 0x26, 0x7a, 0x8f, 0xc1, 0xfd, 0xe3, 0x6b, 0x70, 0x7c, 0xf3, 0x2a, 0xae, 0x0e, 0x9f, - 0xc6, 0xcc, 0xcc, 0x0c, 0x56, 0x56, 0x56, 0xb0, 0xb1, 0xb1, 0x41, 0xef, 0xad, 0x90, 0x70, 0xc4, - 0x83, 0x23, 0x5f, 0x0d, 0xfc, 0x5d, 0x91, 0xef, 0x30, 0x52, 0x84, 0x0e, 0xe6, 0x30, 0xbd, 0x05, - 0xf8, 0xdc, 0xa4, 0xcf, 0x02, 0x31, 0x0e, 0x96, 0xa3, 0x23, 0xd0, 0xd2, 0xd2, 0x92, 0x58, 0xd1, - 0xb7, 0xc3, 0x43, 0xf8, 0x6b, 0xfe, 0x9a, 0x88, 0x92, 0xcf, 0x3c, 0x39, 0x20, 0x7a, 0xe9, 0x57, - 0x2f, 0x21, 0xec, 0xd2, 0xe3, 0xf1, 0xc0, 0xe9, 0x74, 0xc2, 0x66, 0xb3, 0x89, 0x4f, 0xbb, 0xdd, - 0xbe, 0xd3, 0xd5, 0xd5, 0x75, 0x9e, 0x18, 0x8f, 0x0b, 0x10, 0xff, 0xa1, 0x9f, 0x1c, 0xe5, 0xd4, - 0x43, 0x50, 0xbf, 0xab, 0xe5, 0x1e, 0xd1, 0x37, 0x97, 0xbf, 0xf3, 0xef, 0x19, 0xca, 0x20, 0xee, - 0x9b, 0xc5, 0x62, 0xc1, 0xd4, 0xd4, 0x94, 0x88, 0xd8, 0xe1, 0x70, 0xf0, 0xc2, 0x4b, 0x6d, 0x6d, - 0x6d, 0x83, 0x54, 0xdf, 0x48, 0xda, 0xa3, 0x45, 0xc7, 0x8e, 0x18, 0x58, 0x0d, 0xaa, 0x1e, 0x61, - 0xbe, 0xf8, 0x3e, 0x3f, 0xcb, 0xf1, 0x71, 0x4c, 0x1c, 0x29, 0x43, 0xf8, 0x0a, 0x04, 0x02, 0x3c, - 0xc1, 0xa5, 0x96, 0x96, 0x96, 0x3e, 0xaa, 0xfd, 0x28, 0xe9, 0x3e, 0xd2, 0x5d, 0x77, 0x74, 0xa4, - 0x07, 0xc9, 0xd1, 0x95, 0x6e, 0x38, 0x5a, 0x8e, 0xcc, 0x4e, 0x0e, 0xf8, 0xc5, 0xc9, 0xce, 0xc8, - 0xd1, 0x4e, 0x73, 0x73, 0xf3, 0x07, 0x54, 0xf7, 0x11, 0xd2, 0xbd, 0x3c, 0xdd, 0xe5, 0x09, 0xaf, - 0xe3, 0xa8, 0xfa, 0x68, 0xd1, 0x83, 0xf8, 0x19, 0xee, 0x0f, 0xf7, 0x86, 0x7b, 0xc9, 0xd3, 0xb8, - 0xbe, 0xbe, 0xce, 0x43, 0x53, 0x68, 0x6c, 0x6c, 0x3c, 0x41, 0x35, 0x1f, 0x22, 0xdd, 0x23, 0x21, - 0x1a, 0xa8, 0x96, 0xa3, 0x7a, 0x20, 0xfe, 0x99, 0x9f, 0xe1, 0xd1, 0xe5, 0xa9, 0xe2, 0xbd, 0xb5, - 0xba, 0xba, 0x8a, 0xe9, 0xe9, 0xe9, 0xb8, 0xd1, 0x68, 0xec, 0xa4, 0x7a, 0x0f, 0x90, 0xee, 0xd6, - 0x43, 0x24, 0xe8, 0x40, 0x5e, 0xb7, 0xc1, 0xea, 0x0d, 0x41, 0x75, 0x74, 0xb2, 0x47, 0xfe, 0x40, - 0xa0, 0x30, 0x3a, 0x3a, 0x3a, 0xd7, 0xd0, 0xd0, 0xb0, 0x8f, 0x6a, 0xdd, 0xcf, 0xfd, 0xa8, 0x86, - 0x48, 0xd0, 0x7f, 0xfd, 0x07, 0x72, 0x3f, 0xe9, 0x41, 0x7d, 0x3f, 0x6a, 0xe9, 0x1f, 0x89, 0xbc, - 0x3d, 0xaa, 0x92, 0xe6, 0x6d, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, - 0x60, 0x82, -}; - -const BITMAP_OPAQUE new_txt_xpm[1] = {{ png, sizeof( png ), "new_txt_xpm" }}; - -//EOF diff --git a/bitmaps_png/sources/new.svg b/bitmaps_png/sources/new.svg deleted file mode 100644 index 982ee2489c..0000000000 --- a/bitmaps_png/sources/new.svg +++ /dev/null @@ -1,1053 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bitmaps_png/sources/new_txt.svg b/bitmaps_png/sources/new_txt.svg deleted file mode 100644 index e4ea768940..0000000000 --- a/bitmaps_png/sources/new_txt.svg +++ /dev/null @@ -1,1237 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bitmaps_png/sources/new_txt2.svg b/bitmaps_png/sources/new_txt2.svg deleted file mode 100644 index 136fe96454..0000000000 --- a/bitmaps_png/sources/new_txt2.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp index f7eef7f511..c2eb05b6b0 100644 --- a/common/dialogs/wx_html_report_panel.cpp +++ b/common/dialogs/wx_html_report_panel.cpp @@ -212,7 +212,7 @@ void WX_HTML_REPORT_PANEL::onBtnSaveToFile( wxCommandEvent& event ) wxString msg; msg.Printf( _( "Cannot write report to file '%s'." ), - fn.GetFullPath().c_str() ); + fn.GetFullPath().GetData() ); wxMessageBox( msg, _( "File save error" ), wxOK | wxICON_ERROR, this ); return; } diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index cbf7222c3e..b6b34d4d95 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -70,7 +70,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ID_NEW_PROJECT, _( "&New Schematic Project" ), _( "Clear current schematic hierarchy and start a new schematic root sheet" ), - KiBitmap( new_xpm ) ); + KiBitmap( new_sch_xpm ) ); text = AddHotkeyName( _( "&Open Schematic Project" ), g_Schematic_Hokeys_Descr, HK_LOAD_SCH ); AddMenuItem( fileMenu, diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index 91ce5e3870..fdd8d96497 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -54,7 +54,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() if( Kiface().IsSingle() ) // not when under a project mgr { // These 2 menus have meaning only outside a project, i.e. not under a project manager: - m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, KiBitmap( new_xpm ), + m_mainToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, KiBitmap( new_sch_xpm ), _( "New schematic project" ) ); m_mainToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, KiBitmap( open_document_xpm ), diff --git a/include/bitmaps.h b/include/bitmaps.h index 5cd445460b..cbd90feb1d 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -370,8 +370,6 @@ EXTERN_BITMAP( new_project_xpm ) EXTERN_BITMAP( new_project_with_template_xpm ) EXTERN_BITMAP( new_python_xpm ) EXTERN_BITMAP( new_sch_xpm ) -EXTERN_BITMAP( new_txt_xpm ) -EXTERN_BITMAP( new_xpm ) EXTERN_BITMAP( noconn_xpm ) EXTERN_BITMAP( normal_xpm ) EXTERN_BITMAP( online_help_xpm ) @@ -501,6 +499,10 @@ EXTERN_BITMAP( select_grid_xpm ) EXTERN_BITMAP( select_layer_pair_xpm ) EXTERN_BITMAP( select_w_layer_xpm ) EXTERN_BITMAP( sheetset_xpm ) +EXTERN_BITMAP( setcolor_3d_bg_xpm ) +EXTERN_BITMAP( setcolor_silkscreen_xpm ) +EXTERN_BITMAP( setcolor_soldermask_xpm ) +EXTERN_BITMAP( setcolor_copper_xpm ) EXTERN_BITMAP( show_dcodenumber_xpm ) EXTERN_BITMAP( show_footprint_xpm ) EXTERN_BITMAP( show_mod_edge_xpm ) From 1b2bf516a316aeb475406dd6d15f72ca65f7d4db Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 16 Jun 2015 20:14:57 +0200 Subject: [PATCH 2/4] Add icons in 3D viewer for silkscreen, solder mask and copper color selection. --- 3d-viewer/3d_toolbar.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 138962f6a3..8224ceb42c 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -193,10 +193,19 @@ void EDA_3D_FRAME::CreateMenuBar() _( "Choose Colors" ), KiBitmap( palette_xpm ) ); AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_TOP_SELECTION, - _( "Background Top Color" ), KiBitmap( palette_xpm ) ); + _( "Background Top Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION, - _( "Background Bottom Color" ), KiBitmap( palette_xpm ) ); + _( "Background Bottom Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); + + AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, + _( "Silkscreen Color" ), KiBitmap( setcolor_silkscreen_xpm ) ); + + AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, + _( "Solder Mask Color" ), KiBitmap( setcolor_soldermask_xpm ) ); + + AddMenuItem( backgrounColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, + _( "Copper/Surface Finish Color" ), KiBitmap( setcolor_copper_xpm ) ); AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, _( "Silkscreen Color" ), KiBitmap( palette_xpm ) ); From 022ffb31046aea2608a492c49f0cad93689fa73a Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 16 Jun 2015 20:25:15 +0200 Subject: [PATCH 3/4] Add missing files --- bitmaps_png/cpp_26/setcolor_3d_bg.cpp | 110 ++ bitmaps_png/cpp_26/setcolor_copper.cpp | 102 ++ bitmaps_png/cpp_26/setcolor_silkscreen.cpp | 99 ++ bitmaps_png/cpp_26/setcolor_soldermask.cpp | 114 ++ bitmaps_png/sources/setcolor_3d_bg.svg | 1782 +++++++++++++++++++ bitmaps_png/sources/setcolor_copper.svg | 143 ++ bitmaps_png/sources/setcolor_silkscreen.svg | 100 ++ bitmaps_png/sources/setcolor_soldermask.svg | 139 ++ 8 files changed, 2589 insertions(+) create mode 100644 bitmaps_png/cpp_26/setcolor_3d_bg.cpp create mode 100644 bitmaps_png/cpp_26/setcolor_copper.cpp create mode 100644 bitmaps_png/cpp_26/setcolor_silkscreen.cpp create mode 100644 bitmaps_png/cpp_26/setcolor_soldermask.cpp create mode 100644 bitmaps_png/sources/setcolor_3d_bg.svg create mode 100644 bitmaps_png/sources/setcolor_copper.svg create mode 100644 bitmaps_png/sources/setcolor_silkscreen.svg create mode 100644 bitmaps_png/sources/setcolor_soldermask.svg diff --git a/bitmaps_png/cpp_26/setcolor_3d_bg.cpp b/bitmaps_png/cpp_26/setcolor_3d_bg.cpp new file mode 100644 index 0000000000..0b629b8441 --- /dev/null +++ b/bitmaps_png/cpp_26/setcolor_3d_bg.cpp @@ -0,0 +1,110 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x05, 0xcb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x95, 0x96, 0x4b, 0x50, 0x53, + 0x67, 0x14, 0xc7, 0xa3, 0xa8, 0x5d, 0x39, 0xd3, 0x71, 0x3a, 0x7d, 0x2c, 0xda, 0x4d, 0x67, 0x9c, + 0x6e, 0x3a, 0x6e, 0xda, 0x45, 0x17, 0x5d, 0xb9, 0xa9, 0xd3, 0x55, 0x57, 0x2e, 0x4a, 0xdb, 0x71, + 0x59, 0x17, 0x76, 0xc6, 0x99, 0x3a, 0x53, 0xbb, 0xa8, 0xa3, 0x2d, 0x28, 0x0f, 0x43, 0x22, 0x11, + 0x22, 0x01, 0x04, 0x14, 0x14, 0x94, 0x44, 0x14, 0xb4, 0xa0, 0xe5, 0x19, 0xde, 0x60, 0x01, 0x09, + 0x79, 0x90, 0xf7, 0x03, 0x12, 0x42, 0x12, 0xf2, 0x4e, 0x40, 0xfe, 0x3d, 0xe7, 0xbb, 0x26, 0x3c, + 0x7c, 0xb4, 0xcd, 0xcc, 0x7f, 0x72, 0x73, 0x73, 0xef, 0xf9, 0x7d, 0xff, 0x73, 0xce, 0x77, 0xee, + 0x95, 0x1d, 0x3d, 0x7a, 0xf4, 0x5b, 0x8d, 0x46, 0xd3, 0x50, 0x5b, 0x5b, 0x7b, 0xe3, 0x4d, 0x92, + 0xcb, 0xe5, 0xb7, 0x8b, 0x8a, 0x8a, 0xee, 0x9e, 0x3b, 0x77, 0x4e, 0x7b, 0xfe, 0xfc, 0x79, 0xad, + 0x4a, 0xa5, 0x6a, 0xd9, 0x71, 0x4d, 0x7d, 0xfd, 0x6b, 0x75, 0xb1, 0xa4, 0xe4, 0xb2, 0xac, 0xa2, + 0xa2, 0x42, 0xee, 0xf5, 0x2d, 0xc1, 0xb7, 0xb4, 0x8c, 0xa5, 0x65, 0x3f, 0x96, 0xfd, 0x01, 0xf8, + 0x03, 0x01, 0xfa, 0xf6, 0x63, 0x60, 0x60, 0x00, 0x37, 0x9b, 0x6f, 0xa2, 0xac, 0xac, 0x14, 0x17, + 0x2f, 0x5d, 0x44, 0x65, 0xa5, 0x02, 0x9a, 0x5a, 0x35, 0xaa, 0xab, 0x55, 0x28, 0x2a, 0x2e, 0x82, + 0x5c, 0x7e, 0x59, 0xfc, 0xdf, 0xdd, 0xd3, 0x8d, 0xe5, 0xe5, 0x65, 0xac, 0xad, 0xad, 0x6d, 0x29, + 0x1a, 0x95, 0x44, 0xc7, 0xab, 0xab, 0xab, 0x31, 0x19, 0xad, 0x54, 0xe1, 0x74, 0xb9, 0xd0, 0xdf, + 0xdf, 0x2f, 0x00, 0x81, 0x95, 0x15, 0x98, 0xcc, 0x66, 0x54, 0x55, 0x57, 0xa1, 0x5a, 0xad, 0xc2, + 0xc0, 0x60, 0x17, 0xac, 0xd6, 0x09, 0x44, 0x22, 0x66, 0xba, 0x71, 0x11, 0x71, 0xd7, 0x5f, 0x48, + 0xce, 0xd4, 0x23, 0x12, 0x36, 0xc3, 0x66, 0x9f, 0xc2, 0xd8, 0xf8, 0x63, 0xb4, 0xb5, 0xdd, 0xa0, + 0xc5, 0x94, 0x41, 0x3f, 0x3c, 0x8c, 0x68, 0x2c, 0xf6, 0x92, 0x42, 0xa1, 0x50, 0x5c, 0x26, 0x57, + 0x28, 0x14, 0x39, 0x40, 0x60, 0x25, 0x88, 0x7e, 0x72, 0xc1, 0xab, 0xfd, 0xb3, 0x5b, 0x27, 0x05, + 0x5f, 0xb3, 0x08, 0x40, 0x94, 0x94, 0x1a, 0x2e, 0x05, 0x7e, 0xdd, 0x0b, 0x9c, 0x95, 0x61, 0x43, + 0xfd, 0x05, 0x62, 0x31, 0xab, 0xa4, 0xb8, 0x0d, 0x46, 0xd3, 0x28, 0xaa, 0xaa, 0x2a, 0x51, 0x5b, + 0xab, 0x81, 0xdd, 0x6e, 0x47, 0x3c, 0x1e, 0xcf, 0x2b, 0x1c, 0x0e, 0xc7, 0x65, 0xc4, 0x51, 0x78, + 0xbc, 0x5e, 0x8c, 0x8c, 0x8c, 0xc0, 0xee, 0x70, 0xa0, 0x98, 0x20, 0x0b, 0xc6, 0x11, 0x04, 0x02, + 0xf3, 0x04, 0x36, 0x08, 0x80, 0x10, 0x05, 0xdc, 0xa8, 0x3c, 0x22, 0x20, 0x39, 0x25, 0xad, 0x9d, + 0x88, 0x27, 0xec, 0x04, 0x32, 0xc3, 0x17, 0x7e, 0x22, 0xa0, 0xfd, 0xfd, 0x5d, 0x28, 0x2b, 0x2f, + 0x03, 0xc7, 0x4c, 0x24, 0x93, 0x42, 0xe1, 0x48, 0x44, 0x02, 0xad, 0x04, 0x83, 0xf0, 0x53, 0x4d, + 0xee, 0xdd, 0xbb, 0x07, 0x9d, 0xae, 0x05, 0x3d, 0x3d, 0x3a, 0x72, 0x55, 0x4c, 0xd0, 0x62, 0x34, + 0xb7, 0x34, 0x52, 0xfe, 0x9f, 0x89, 0x20, 0x59, 0xed, 0x89, 0x3c, 0x64, 0xf3, 0xf7, 0x43, 0x48, + 0xae, 0x19, 0xe1, 0x8b, 0x3c, 0x46, 0xbd, 0xe1, 0x7d, 0xa8, 0xe6, 0x64, 0xe8, 0xb4, 0x1f, 0x43, + 0x32, 0xe9, 0x40, 0x5f, 0x5f, 0x27, 0xd4, 0x6a, 0x35, 0x2d, 0x30, 0x8a, 0x54, 0x2a, 0x45, 0x99, + 0x79, 0x01, 0xe2, 0xd4, 0x4d, 0x4f, 0x4f, 0xa3, 0xae, 0xbe, 0x0e, 0x53, 0xd3, 0xbd, 0xb8, 0x75, + 0xab, 0x41, 0xd4, 0x8c, 0x1b, 0xa2, 0xa3, 0xa3, 0x43, 0xa4, 0x24, 0x18, 0x34, 0x22, 0xb1, 0xfa, + 0x37, 0xb2, 0x0f, 0x4f, 0x61, 0xbd, 0xe9, 0x6b, 0xa4, 0x16, 0x3b, 0x44, 0xd0, 0x27, 0xce, 0xef, + 0x04, 0x24, 0x27, 0x77, 0xf8, 0xbe, 0x38, 0x7f, 0xbb, 0xf5, 0x06, 0xb4, 0x3a, 0x2d, 0xd2, 0xe9, + 0x34, 0x37, 0x84, 0x04, 0x0a, 0x92, 0x23, 0x8f, 0xc7, 0x03, 0xd5, 0x55, 0x15, 0xe6, 0xe6, 0x06, + 0x45, 0x81, 0xcb, 0xcb, 0xcb, 0x45, 0xae, 0x63, 0x94, 0xe3, 0xc6, 0xa6, 0x46, 0x8c, 0x8e, 0x76, + 0x23, 0x41, 0x69, 0x4a, 0x50, 0x90, 0xe4, 0x36, 0xe9, 0xbd, 0x3f, 0xe5, 0x21, 0x57, 0x9f, 0xed, + 0x41, 0x20, 0x36, 0x48, 0x2e, 0x9c, 0x14, 0x7c, 0x91, 0xba, 0xf3, 0x2a, 0xc5, 0x9b, 0x63, 0x67, + 0x12, 0x28, 0x14, 0x0e, 0xc3, 0x6c, 0xb1, 0x60, 0x70, 0x68, 0x10, 0x0a, 0xa5, 0x02, 0x46, 0xaa, + 0xd1, 0xd0, 0xd0, 0x43, 0x94, 0x94, 0x5c, 0x82, 0x46, 0x53, 0x83, 0x52, 0x6a, 0xef, 0xf1, 0xf1, + 0x27, 0x3b, 0x00, 0x1c, 0x8c, 0x15, 0x8e, 0x4f, 0x41, 0x67, 0xfd, 0x12, 0x35, 0x86, 0x83, 0x18, + 0xf1, 0x9e, 0x26, 0x07, 0xae, 0xbc, 0xa6, 0xa7, 0xfb, 0xd0, 0x4c, 0xed, 0x1f, 0x8b, 0xc5, 0x5e, + 0xd4, 0x88, 0x3a, 0x6e, 0x71, 0x71, 0x51, 0xf4, 0xfd, 0xc8, 0xe8, 0x88, 0x80, 0xd5, 0xd4, 0x54, + 0x63, 0x76, 0x76, 0x10, 0x33, 0x33, 0x03, 0xe4, 0x76, 0xf6, 0x25, 0x40, 0x4e, 0xb9, 0xa0, 0xa9, + 0xb4, 0x5d, 0x7c, 0x87, 0x13, 0x2e, 0xc4, 0x53, 0xd2, 0xb9, 0x68, 0xd4, 0x2a, 0x32, 0x43, 0xf5, + 0x97, 0x40, 0x11, 0xda, 0x54, 0x5e, 0x9f, 0x4f, 0xf4, 0x3c, 0xa7, 0x8a, 0x8b, 0x38, 0x31, 0x31, + 0x41, 0x17, 0x95, 0xc1, 0xed, 0x9e, 0x79, 0x23, 0x60, 0xbb, 0xae, 0x18, 0xdc, 0x38, 0x74, 0xc7, + 0x83, 0x0f, 0x75, 0x1e, 0x68, 0x1d, 0x6e, 0x71, 0x8e, 0x17, 0xbc, 0xb0, 0xb0, 0x90, 0xc8, 0x3b, + 0x9a, 0x9d, 0x9d, 0x65, 0x8b, 0xa2, 0xef, 0x13, 0x89, 0x04, 0x05, 0x4f, 0x42, 0xaf, 0x1f, 0x42, + 0x5d, 0xdd, 0xb5, 0x7f, 0x05, 0xb0, 0xfc, 0x31, 0x17, 0x0e, 0xb6, 0x7a, 0x20, 0x6b, 0x96, 0x74, + 0xf8, 0xbe, 0x87, 0xce, 0xbb, 0xd1, 0x4a, 0x4d, 0x41, 0x8b, 0x4e, 0x0a, 0x10, 0x3b, 0xa0, 0xdd, + 0xbb, 0x03, 0xc2, 0x6d, 0xc9, 0xbf, 0x4b, 0x4b, 0x4b, 0x69, 0xc3, 0x99, 0x25, 0x48, 0xd2, 0x85, + 0x84, 0xd9, 0xf2, 0x12, 0x24, 0x93, 0x71, 0x63, 0x35, 0xe1, 0xc6, 0xdb, 0x77, 0xb6, 0x40, 0x9f, + 0x76, 0x7a, 0xc4, 0xf9, 0x96, 0x96, 0x26, 0x4c, 0x4d, 0x4d, 0x25, 0xf3, 0x8e, 0xc6, 0xc7, 0xc7, + 0x77, 0x40, 0xb8, 0x2d, 0x33, 0x99, 0x0c, 0xea, 0xa9, 0xe5, 0xcd, 0x66, 0xfa, 0xcf, 0x60, 0x81, + 0xff, 0x70, 0x27, 0x96, 0xf6, 0xb4, 0x23, 0x78, 0xbc, 0x2f, 0x0f, 0xd8, 0xae, 0xeb, 0x8b, 0x52, + 0xda, 0x3e, 0x21, 0x37, 0x3d, 0x5e, 0x09, 0x54, 0x59, 0x79, 0x05, 0x0e, 0x87, 0x43, 0x4a, 0x1d, + 0xd7, 0x85, 0x95, 0xd8, 0x05, 0xc9, 0x66, 0xb3, 0x68, 0x68, 0xb8, 0x0e, 0x8b, 0x65, 0x02, 0xa1, + 0x53, 0x7a, 0xf8, 0x64, 0x77, 0xf3, 0x4a, 0x0c, 0x19, 0x5f, 0x00, 0x6c, 0xc8, 0x46, 0x94, 0xc8, + 0xc6, 0x6e, 0x8b, 0xdf, 0xa9, 0x0c, 0x03, 0x3c, 0x74, 0xaf, 0x87, 0x6a, 0x6d, 0x13, 0x33, 0x30, + 0xdf, 0xde, 0xec, 0x48, 0xaf, 0xd7, 0x4b, 0x6e, 0xb6, 0x41, 0x58, 0x4d, 0xb4, 0x87, 0xe6, 0xe7, + 0x87, 0x11, 0x3a, 0xbd, 0x13, 0x94, 0x1c, 0x37, 0x89, 0xc0, 0x59, 0xef, 0x67, 0xc8, 0xd8, 0x64, + 0x42, 0xd9, 0xe0, 0xa9, 0x1d, 0x0e, 0xad, 0xd6, 0x49, 0x5c, 0xbb, 0xa6, 0xe6, 0x12, 0x48, 0xa0, + 0x38, 0xa5, 0x8c, 0x9d, 0xec, 0x76, 0xb3, 0xbe, 0xbe, 0x2e, 0x16, 0xd0, 0xd1, 0xd1, 0x86, 0x94, + 0xd9, 0x8a, 0xc0, 0x91, 0x87, 0x58, 0x2a, 0x68, 0x47, 0xe8, 0xc4, 0x80, 0x04, 0x49, 0xf6, 0xe5, + 0x21, 0x42, 0x8e, 0x77, 0xf2, 0x4d, 0xc3, 0x9d, 0xda, 0xd8, 0x58, 0x27, 0x1e, 0x35, 0x79, 0x47, + 0x3c, 0x19, 0xf8, 0xc4, 0x6e, 0x37, 0x0c, 0xe2, 0x26, 0xa1, 0x4b, 0x84, 0x2b, 0x0e, 0x9e, 0x5e, + 0xb2, 0x4b, 0x10, 0x4a, 0x4d, 0x36, 0x43, 0xc7, 0xce, 0xf7, 0xf2, 0xa0, 0xb4, 0xf7, 0x18, 0xad, + 0xde, 0x26, 0xe6, 0xa2, 0x5e, 0xff, 0x88, 0xe6, 0x5d, 0x35, 0xcf, 0xb9, 0xad, 0xe9, 0xcd, 0xb5, + 0xe1, 0xb4, 0xed, 0x76, 0xc3, 0xda, 0xd8, 0xd8, 0xa0, 0xbd, 0xe4, 0x16, 0x30, 0xa3, 0x71, 0x6c, + 0x0b, 0x92, 0x95, 0x8a, 0x9d, 0x8e, 0xde, 0x47, 0xda, 0x47, 0xc3, 0x74, 0xe9, 0x7b, 0x44, 0xc3, + 0x43, 0x14, 0xd4, 0x84, 0xe1, 0xe1, 0x47, 0xe2, 0x29, 0x30, 0x3f, 0x3f, 0x0f, 0x2e, 0xcb, 0xe8, + 0xe8, 0xa8, 0x51, 0x1a, 0x41, 0xb4, 0x6a, 0x4e, 0x51, 0x7a, 0x97, 0x1b, 0x86, 0xb0, 0x9e, 0x3f, + 0x7f, 0x2e, 0xe6, 0x9e, 0x52, 0x29, 0x39, 0xcb, 0x41, 0x38, 0x45, 0x3c, 0xff, 0xd8, 0x41, 0x30, + 0xb8, 0x40, 0x63, 0xeb, 0x01, 0x2e, 0x5c, 0xf8, 0x0d, 0x67, 0xcf, 0xfe, 0x42, 0x4f, 0x82, 0x0e, + 0xde, 0xa8, 0x9c, 0xa9, 0x15, 0x99, 0x4c, 0xf6, 0x83, 0x00, 0xb1, 0x1b, 0xde, 0x33, 0xaf, 0x72, + 0x93, 0x03, 0x6d, 0x6e, 0x6e, 0x52, 0x71, 0xad, 0xa2, 0xb8, 0x1a, 0x8d, 0x1a, 0xed, 0xed, 0xb7, + 0xf0, 0xe0, 0xc1, 0x1d, 0x6a, 0x96, 0x3a, 0x54, 0x54, 0x5c, 0xc6, 0x99, 0x33, 0x3f, 0xe3, 0xe4, + 0xc9, 0x1f, 0x69, 0x83, 0xb6, 0xc2, 0x45, 0x4f, 0x6c, 0x9b, 0xcd, 0x86, 0xce, 0xae, 0x2e, 0x3f, + 0x41, 0x0a, 0x49, 0x1f, 0x09, 0xd0, 0x2a, 0x39, 0xe2, 0x7d, 0xf4, 0x2a, 0x10, 0x43, 0x72, 0xa0, + 0x9c, 0x18, 0xc8, 0x23, 0xaa, 0xb7, 0xb7, 0x17, 0x63, 0x63, 0x63, 0x78, 0xfa, 0xf4, 0xa9, 0x38, + 0x76, 0x3a, 0x9d, 0x62, 0xc1, 0x16, 0x1a, 0xd0, 0x5a, 0xad, 0xce, 0xbb, 0x6f, 0xdf, 0xbe, 0xe3, + 0x04, 0xf9, 0x80, 0x54, 0x20, 0x40, 0xdc, 0x6d, 0x54, 0xb0, 0xff, 0x04, 0xe2, 0x0f, 0x9f, 0xe7, + 0x7a, 0xf2, 0x44, 0xa1, 0x17, 0x0f, 0x01, 0xe8, 0xee, 0xe9, 0x11, 0xc7, 0x26, 0x93, 0x89, 0xde, + 0x21, 0xda, 0x9c, 0x07, 0x0e, 0x1c, 0xf8, 0x86, 0x00, 0xef, 0x32, 0x84, 0x6e, 0x91, 0x49, 0x1b, + 0x96, 0x66, 0x1c, 0x3f, 0x37, 0xb6, 0x83, 0xb6, 0xa7, 0x2d, 0x07, 0xe2, 0x0f, 0x7f, 0xf3, 0xff, + 0x9c, 0x6e, 0x7e, 0xc3, 0xe1, 0x62, 0x5b, 0xad, 0x36, 0x4c, 0x4e, 0x4e, 0xc2, 0x60, 0x30, 0xd0, + 0x06, 0x6f, 0x30, 0xec, 0xdf, 0xbf, 0xff, 0x2b, 0x02, 0x1c, 0x22, 0xed, 0x65, 0x48, 0x1e, 0xc4, + 0x76, 0xf9, 0x75, 0xe9, 0xff, 0x82, 0xb8, 0x75, 0x03, 0xf4, 0x74, 0xe6, 0x46, 0xa1, 0xa1, 0xbc, + 0xa9, 0x54, 0x2a, 0xfb, 0x0b, 0x0a, 0x0a, 0x3e, 0x27, 0xc0, 0x41, 0xd2, 0x9e, 0x1c, 0x44, 0x80, + 0xe8, 0xbd, 0xae, 0xfc, 0x75, 0x6d, 0xfd, 0x26, 0x10, 0xdf, 0x13, 0x93, 0x5e, 0xa5, 0xa8, 0xed, + 0x8d, 0xa9, 0xc2, 0xc2, 0xc2, 0x3f, 0x28, 0xf8, 0xc7, 0xa4, 0xb7, 0x76, 0x43, 0x58, 0xff, 0x00, + 0x0b, 0xa8, 0xbd, 0x9e, 0xa7, 0x47, 0x49, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, + 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE setcolor_3d_bg_xpm[1] = {{ png, sizeof( png ), "setcolor_3d_bg_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/setcolor_copper.cpp b/bitmaps_png/cpp_26/setcolor_copper.cpp new file mode 100644 index 0000000000..9df50da76e --- /dev/null +++ b/bitmaps_png/cpp_26/setcolor_copper.cpp @@ -0,0 +1,102 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x05, 0x49, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xa5, 0x96, 0x0b, 0x4c, 0x53, + 0x57, 0x18, 0xc7, 0xcf, 0xed, 0x83, 0xde, 0x3e, 0x24, 0x03, 0x83, 0xc9, 0x20, 0x7b, 0xb0, 0x19, + 0x64, 0x51, 0x58, 0x7c, 0x4c, 0x36, 0x9d, 0xc6, 0x05, 0xac, 0x43, 0x33, 0x5a, 0xc4, 0x80, 0xca, + 0x36, 0xa7, 0x28, 0x6e, 0xab, 0xb3, 0xaf, 0x83, 0x6e, 0x02, 0x52, 0x0d, 0xcd, 0x86, 0x8a, 0x0f, + 0x12, 0xeb, 0x86, 0x51, 0x26, 0x4a, 0xa5, 0x43, 0x1e, 0x82, 0xc3, 0xa8, 0xe0, 0xf0, 0x35, 0x9c, + 0x8a, 0x0b, 0x16, 0x17, 0xa6, 0x28, 0x42, 0x8d, 0x02, 0x26, 0x80, 0x4d, 0x79, 0x54, 0x81, 0xbb, + 0xef, 0x5c, 0xb8, 0x5d, 0x81, 0xc2, 0x5c, 0x6c, 0xf2, 0xe7, 0xe6, 0x9c, 0x53, 0xbe, 0xdf, 0xf9, + 0xce, 0xf7, 0x3f, 0xdf, 0x2d, 0x62, 0x18, 0x06, 0x79, 0x12, 0x7c, 0x26, 0x80, 0x82, 0x85, 0x42, + 0xbe, 0x5c, 0x26, 0x13, 0x27, 0x88, 0xc5, 0xf4, 0x06, 0xa1, 0x50, 0xa0, 0xe1, 0xf1, 0x78, 0x7a, + 0xa9, 0x54, 0x9c, 0x28, 0x16, 0x8b, 0x14, 0xb0, 0x1e, 0x06, 0x7a, 0x1b, 0x24, 0x1d, 0x2b, 0x8e, + 0x2b, 0x9e, 0x07, 0x80, 0x94, 0xa6, 0x45, 0x31, 0x14, 0x45, 0xe1, 0xa0, 0xa0, 0xd7, 0xd4, 0x09, + 0x09, 0x4a, 0x7d, 0x76, 0x76, 0x0a, 0x2e, 0x2f, 0xcf, 0xc2, 0xd5, 0xd5, 0x3f, 0xe3, 0x9a, 0x9a, + 0x63, 0xd8, 0x6c, 0x36, 0xe2, 0x2d, 0x5b, 0xd6, 0xe0, 0xc8, 0xc8, 0x39, 0x1a, 0x7f, 0x7f, 0x3f, + 0x35, 0x81, 0xc3, 0x86, 0x22, 0xe0, 0x7f, 0xe9, 0x17, 0x02, 0xc1, 0x67, 0x1a, 0xec, 0x5a, 0xbd, + 0x68, 0xd1, 0x1c, 0xed, 0xdd, 0xbb, 0x25, 0xd8, 0xe1, 0xb8, 0xec, 0x52, 0xb7, 0x2d, 0x7f, 0x6b, + 0xdf, 0x81, 0xd0, 0xea, 0x01, 0x83, 0xf8, 0x29, 0x79, 0x92, 0x31, 0xb7, 0x76, 0xf9, 0xf2, 0x61, + 0x3c, 0x6b, 0xd6, 0x3b, 0x1a, 0x2f, 0x2f, 0xe1, 0x46, 0x88, 0xf1, 0x2e, 0x88, 0x1a, 0x13, 0x04, + 0xbb, 0x0a, 0xf3, 0xf6, 0x96, 0x6a, 0x73, 0x73, 0xb7, 0x0f, 0x03, 0x70, 0xea, 0x3b, 0x32, 0xff, + 0x0c, 0xb3, 0x05, 0xbe, 0x3a, 0xa4, 0xbe, 0x9c, 0xb9, 0xe7, 0x46, 0x7e, 0x27, 0x27, 0xc7, 0x80, + 0xfd, 0xfc, 0x5e, 0xd1, 0x4a, 0x24, 0xa2, 0xd5, 0x23, 0xb3, 0xe3, 0x32, 0x91, 0x41, 0x26, 0xda, + 0x92, 0x92, 0x4c, 0x5c, 0x5a, 0xba, 0x07, 0xaf, 0x59, 0xa3, 0xd0, 0xef, 0xdb, 0x97, 0x84, 0x9b, + 0x9a, 0x7e, 0x75, 0x05, 0xe9, 0xdf, 0x3b, 0xb9, 0xd6, 0x1d, 0xd4, 0xbf, 0x27, 0xb0, 0x8e, 0xcc, + 0xb7, 0x76, 0x9c, 0x48, 0x39, 0xdd, 0xb8, 0xb0, 0xac, 0xe0, 0x6e, 0x68, 0xf5, 0xed, 0xd6, 0xf4, + 0xcc, 0xb6, 0xb6, 0x0a, 0x2c, 0x97, 0x7f, 0xa0, 0x85, 0x9a, 0xae, 0x80, 0xb8, 0xbc, 0x91, 0xa0, + 0x90, 0xe0, 0xe0, 0x37, 0xd4, 0x57, 0xae, 0x1c, 0xc6, 0x3c, 0x1e, 0x85, 0xe1, 0xbc, 0x17, 0x4b, + 0xa5, 0x74, 0x02, 0xc0, 0xf5, 0xc5, 0xc5, 0x99, 0x2c, 0xa8, 0xf7, 0x52, 0xd2, 0x7e, 0x26, 0x85, + 0xff, 0x9c, 0x05, 0xc1, 0xb3, 0xf7, 0x22, 0xde, 0x4f, 0xe6, 0xf3, 0xef, 0x04, 0xd7, 0xec, 0xb7, + 0x22, 0x86, 0xe8, 0x40, 0x9d, 0xc0, 0xf9, 0xb8, 0xa3, 0x20, 0xb5, 0xa5, 0xe5, 0x2c, 0x0e, 0x0c, + 0x0c, 0xd0, 0x08, 0x85, 0xc2, 0xf0, 0x91, 0xa0, 0x05, 0xcb, 0x97, 0x2f, 0xd2, 0x5d, 0xbb, 0x96, + 0x4b, 0x40, 0x7a, 0x18, 0xfb, 0x0e, 0xcd, 0x4f, 0x05, 0x98, 0xee, 0xfc, 0xf9, 0x9f, 0x58, 0x58, + 0x97, 0xcd, 0x92, 0xfa, 0xac, 0xec, 0xb3, 0xa3, 0xe4, 0x49, 0xc6, 0x9d, 0xf6, 0x8a, 0xcd, 0x26, + 0x2b, 0xff, 0x39, 0x07, 0x22, 0xaa, 0x6a, 0x8e, 0x33, 0x93, 0xb5, 0xda, 0xda, 0x7c, 0x2c, 0x91, + 0xd0, 0x5a, 0x92, 0x84, 0x0b, 0x04, 0xf5, 0x99, 0x4b, 0x8a, 0xd9, 0xd1, 0x51, 0x85, 0x13, 0x13, + 0x97, 0xea, 0x69, 0x5a, 0xa8, 0x22, 0xd6, 0x06, 0x89, 0xc0, 0xc6, 0xab, 0x76, 0xef, 0xd6, 0x79, + 0xac, 0x1b, 0x51, 0xde, 0xdf, 0x81, 0x75, 0x1c, 0xc4, 0x64, 0xe5, 0xf5, 0x35, 0xb7, 0x1f, 0xd9, + 0xc6, 0xad, 0x9d, 0x38, 0xb1, 0x03, 0x0b, 0x04, 0x7c, 0x02, 0xf3, 0xe2, 0x32, 0x12, 0x83, 0xa5, + 0x13, 0xa7, 0x4f, 0x9f, 0xa2, 0xb5, 0x58, 0x7e, 0xc0, 0x69, 0x69, 0x89, 0xfa, 0x80, 0x80, 0x49, + 0x6a, 0x98, 0xc7, 0x13, 0x27, 0x7a, 0x6b, 0x8a, 0x8a, 0x76, 0x8d, 0x09, 0x6a, 0x6a, 0x3f, 0xb4, + 0xbd, 0xb8, 0xe1, 0xbd, 0xaa, 0x63, 0xf5, 0x81, 0x75, 0xd7, 0x1f, 0xa9, 0x7f, 0x1c, 0xb9, 0x1e, + 0x14, 0xf4, 0x3a, 0x89, 0x13, 0xe2, 0x6e, 0x6d, 0x1a, 0x32, 0x9b, 0x27, 0x12, 0x79, 0x7d, 0x03, + 0x77, 0x43, 0x73, 0xee, 0x9c, 0x09, 0xd7, 0xd5, 0x15, 0x60, 0xbb, 0xfd, 0xe2, 0x98, 0x10, 0x4f, + 0x3a, 0xd3, 0x7c, 0xc3, 0x68, 0x69, 0xa8, 0xd9, 0xc9, 0x8d, 0x33, 0x32, 0x36, 0x62, 0xb8, 0xf0, + 0x2b, 0x3c, 0x5d, 0x58, 0xde, 0xa0, 0xd5, 0x65, 0xda, 0xfa, 0xfa, 0xa2, 0xff, 0x05, 0x59, 0x70, + 0xb6, 0xe1, 0x22, 0x75, 0xfc, 0xe1, 0x00, 0x32, 0x3f, 0x64, 0xa6, 0x94, 0x36, 0xfe, 0x45, 0xe6, + 0xc8, 0x45, 0x87, 0x5a, 0x7d, 0x3d, 0x66, 0xcb, 0xa0, 0x69, 0xaf, 0x25, 0x72, 0xf9, 0xfb, 0xda, + 0x17, 0x85, 0x54, 0xda, 0x6e, 0xa4, 0xf3, 0xcc, 0xb6, 0x7e, 0x02, 0xe1, 0xb4, 0xf3, 0xd6, 0xad, + 0x03, 0x56, 0xab, 0x65, 0xd0, 0x60, 0xe3, 0xf4, 0x3a, 0x7f, 0x30, 0x82, 0xce, 0xfd, 0xe8, 0x3a, + 0x8f, 0x57, 0xee, 0x72, 0x74, 0x5e, 0x4a, 0xf2, 0x04, 0xba, 0xf3, 0xe4, 0x6a, 0xb2, 0xc8, 0x62, + 0xeb, 0xe6, 0x20, 0x24, 0xb3, 0xe2, 0x7b, 0x35, 0x19, 0x17, 0x2e, 0x1c, 0xc4, 0xa4, 0xdb, 0x8c, + 0x07, 0xe2, 0x43, 0xbf, 0xd3, 0xdf, 0xbc, 0x99, 0x87, 0xd7, 0x1d, 0x54, 0x9e, 0x8e, 0x5e, 0x39, + 0xaf, 0x3b, 0x56, 0xb9, 0x80, 0x89, 0x5f, 0xb6, 0xb0, 0xa7, 0xd3, 0x5c, 0x99, 0xe9, 0x09, 0x86, + 0xaf, 0xdf, 0xce, 0xf5, 0x2d, 0x68, 0x6e, 0x93, 0xfd, 0x62, 0x7b, 0xba, 0xf2, 0x52, 0xfd, 0x49, + 0x32, 0x67, 0x32, 0x7d, 0x07, 0x35, 0x92, 0xac, 0x1a, 0xbf, 0xe3, 0x82, 0xeb, 0xa2, 0x73, 0x3e, + 0x2a, 0x42, 0x06, 0xc4, 0x70, 0xf2, 0xfe, 0x56, 0xc2, 0xb4, 0xce, 0x28, 0xad, 0xe1, 0x82, 0x77, + 0x3d, 0x2d, 0x4a, 0xe9, 0x79, 0x1c, 0x63, 0xe9, 0x6a, 0xcf, 0x60, 0x0d, 0x60, 0x77, 0x5c, 0x49, + 0x6a, 0xb7, 0xff, 0xbe, 0x89, 0x5b, 0x57, 0xa9, 0xe2, 0x48, 0xc3, 0xfd, 0x78, 0x3c, 0x08, 0x45, + 0xc9, 0xd1, 0x51, 0xca, 0x40, 0x0d, 0xb8, 0x83, 0xa8, 0x54, 0x8a, 0x69, 0x09, 0x39, 0x59, 0xcb, + 0x42, 0x3a, 0x4c, 0x46, 0x67, 0xa3, 0xa0, 0xd7, 0x79, 0x1f, 0x31, 0x44, 0x3d, 0x8f, 0xe4, 0x65, + 0x23, 0xb3, 0x9c, 0x3d, 0x7b, 0x1a, 0xb1, 0xf7, 0xcc, 0xd1, 0x80, 0x74, 0x14, 0x80, 0xb6, 0xa1, + 0x38, 0xd0, 0x7a, 0x94, 0x86, 0xfa, 0x5c, 0x90, 0x75, 0xa0, 0x18, 0xc4, 0xc8, 0x14, 0xe2, 0x81, + 0x8e, 0x43, 0x95, 0x7b, 0xd9, 0xb6, 0xf4, 0x30, 0xec, 0x37, 0x0e, 0xc2, 0xaa, 0x51, 0x6c, 0x77, + 0x38, 0x2e, 0xb8, 0x6a, 0x48, 0xda, 0x17, 0x9f, 0xcf, 0xd7, 0x91, 0x4e, 0x33, 0x18, 0xdc, 0x80, + 0x68, 0xd0, 0xf7, 0xa0, 0x5b, 0xee, 0xbb, 0x77, 0x49, 0x05, 0x99, 0x28, 0xa8, 0xfe, 0xa9, 0xf1, + 0x6f, 0x35, 0x87, 0xa8, 0x26, 0x5b, 0xb9, 0x40, 0x3d, 0x2d, 0xb1, 0xc7, 0x87, 0x81, 0x1e, 0xf8, + 0x37, 0x70, 0x6b, 0x36, 0x5b, 0x39, 0xf6, 0xf1, 0xf1, 0x26, 0x5d, 0x61, 0xe6, 0xe0, 0x09, 0x65, + 0x21, 0x11, 0x04, 0xab, 0x18, 0x16, 0x38, 0x15, 0x39, 0x87, 0x8d, 0xa1, 0x91, 0x46, 0x18, 0xc2, + 0x46, 0x1d, 0x4b, 0x97, 0xfd, 0xec, 0xe6, 0x1e, 0x5b, 0x68, 0xb5, 0xf3, 0xbe, 0xc0, 0xd9, 0xdb, + 0xf4, 0xea, 0xbd, 0xee, 0x27, 0x5b, 0xd9, 0x4c, 0x1f, 0x3c, 0x38, 0x85, 0xc3, 0xc3, 0x67, 0xeb, + 0xa0, 0x83, 0x2f, 0x27, 0x35, 0x18, 0x04, 0x6d, 0x43, 0x91, 0x43, 0x01, 0x07, 0xd8, 0xe3, 0x89, + 0x05, 0x45, 0x81, 0x96, 0x82, 0x56, 0x83, 0x92, 0x07, 0x61, 0xfc, 0x2f, 0x78, 0x95, 0x55, 0x55, + 0xd9, 0x9e, 0xef, 0x11, 0x34, 0x57, 0xf6, 0x95, 0xd1, 0x5a, 0x81, 0x93, 0x93, 0x13, 0x30, 0xdc, + 0x41, 0x1d, 0x5c, 0x52, 0xf2, 0x9a, 0x90, 0xfd, 0x5b, 0x73, 0x3d, 0x2a, 0x64, 0x41, 0x98, 0x05, + 0xf4, 0x83, 0xae, 0x82, 0x76, 0x80, 0x4e, 0x81, 0xba, 0xd0, 0x97, 0x43, 0x59, 0x61, 0xd4, 0x46, + 0xce, 0x7b, 0xd9, 0xb2, 0x70, 0x4d, 0x56, 0xd6, 0x26, 0x5c, 0x58, 0xb8, 0x13, 0xe7, 0xe5, 0xa5, + 0x63, 0xa3, 0x51, 0x85, 0xd7, 0xae, 0x8d, 0xc6, 0xf3, 0xe7, 0xcf, 0xd0, 0x4c, 0x98, 0x20, 0x85, + 0x97, 0x1e, 0x4d, 0x5e, 0x7a, 0x6f, 0x8e, 0x36, 0xd7, 0xe7, 0xe8, 0x0f, 0xd7, 0x11, 0xa5, 0xa0, + 0x7c, 0x78, 0x2a, 0x41, 0xbe, 0xa0, 0x0f, 0xc1, 0x0c, 0x46, 0xb4, 0x75, 0xc8, 0x10, 0xeb, 0x01, + 0x8a, 0x90, 0x0f, 0x58, 0x35, 0x1c, 0xde, 0xc4, 0xf1, 0xf0, 0x03, 0xe5, 0x2b, 0xd0, 0x7a, 0x08, + 0x1e, 0xc7, 0xe7, 0xf3, 0x22, 0x58, 0x67, 0x01, 0x80, 0x3b, 0xaa, 0xd1, 0xa0, 0x28, 0xc8, 0x69, + 0x83, 0x07, 0x03, 0xb8, 0x6b, 0x13, 0xeb, 0xb8, 0xf2, 0xff, 0xfa, 0xa5, 0x33, 0xfe, 0x9d, 0x54, + 0xc2, 0x2e, 0xa2, 0x50, 0x2f, 0x5b, 0x0f, 0x0d, 0x7a, 0x0e, 0x46, 0x78, 0xc6, 0x06, 0x4f, 0x83, + 0x63, 0xc4, 0xa8, 0x87, 0xad, 0x5b, 0x34, 0xe8, 0x13, 0x14, 0xfb, 0x52, 0x20, 0xf6, 0x8f, 0x02, + 0x45, 0xb0, 0xf5, 0x20, 0x26, 0x50, 0x80, 0xe2, 0x40, 0xca, 0x21, 0x53, 0x44, 0x81, 0x49, 0x14, + 0x28, 0xf9, 0x65, 0x20, 0xc3, 0x7e, 0x05, 0xc1, 0x8e, 0x25, 0x10, 0x70, 0x31, 0x28, 0x0b, 0x82, + 0xff, 0x09, 0xe3, 0x3c, 0x78, 0x7e, 0x0a, 0xd9, 0x4c, 0x7a, 0x59, 0x08, 0xd1, 0x3f, 0x84, 0x4f, + 0xbf, 0xac, 0x87, 0x9a, 0x08, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, +}; + +const BITMAP_OPAQUE setcolor_copper_xpm[1] = {{ png, sizeof( png ), "setcolor_copper_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/setcolor_silkscreen.cpp b/bitmaps_png/cpp_26/setcolor_silkscreen.cpp new file mode 100644 index 0000000000..43f01d14e4 --- /dev/null +++ b/bitmaps_png/cpp_26/setcolor_silkscreen.cpp @@ -0,0 +1,99 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x05, 0x24, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xa5, 0x96, 0x0b, 0x4c, 0x93, + 0x57, 0x14, 0xc7, 0x4b, 0xe9, 0x0b, 0x88, 0x8e, 0x40, 0x94, 0x08, 0x93, 0x19, 0x66, 0xc6, 0xa3, + 0x40, 0x80, 0x38, 0x46, 0x1c, 0x63, 0x8c, 0x4e, 0x1e, 0x03, 0x0c, 0x8f, 0x89, 0x04, 0x21, 0xc2, + 0x0c, 0x21, 0x22, 0xc8, 0xa3, 0x9f, 0x02, 0x02, 0x1b, 0x19, 0x5b, 0x75, 0x4e, 0x82, 0x1b, 0x8f, + 0x2c, 0x4e, 0x32, 0x8c, 0x20, 0xc5, 0x05, 0xd6, 0x35, 0x28, 0x32, 0x04, 0x04, 0xf1, 0x11, 0x24, + 0x4e, 0xc3, 0x40, 0xed, 0x16, 0xde, 0x10, 0x60, 0x20, 0x58, 0x5a, 0xca, 0xbb, 0x3b, 0xe7, 0x83, + 0xaf, 0x7e, 0x14, 0xda, 0x98, 0xac, 0xc9, 0x9f, 0x96, 0x7b, 0xbf, 0xef, 0xfc, 0xce, 0xbd, 0xe7, + 0xdc, 0x73, 0x2e, 0x43, 0xad, 0x56, 0x33, 0xb6, 0x12, 0x7c, 0x76, 0x80, 0xf6, 0x71, 0x38, 0x9c, + 0x08, 0x63, 0x63, 0x6e, 0x02, 0x97, 0xcb, 0x4e, 0x66, 0x32, 0x19, 0x42, 0x36, 0x9b, 0x99, 0xc2, + 0xe3, 0xf1, 0xe2, 0x39, 0x1c, 0xc3, 0x08, 0x98, 0x77, 0x03, 0x6d, 0xd7, 0x65, 0x63, 0x83, 0x3d, + 0x2d, 0xe3, 0x2c, 0x90, 0x07, 0x9b, 0xcd, 0x4e, 0x82, 0x6f, 0xc2, 0xda, 0xda, 0x22, 0x35, 0x3e, + 0x3e, 0x94, 0x28, 0x28, 0x48, 0x25, 0xca, 0xcb, 0xf3, 0x08, 0xa9, 0xb4, 0x90, 0xa8, 0xaa, 0x12, + 0x11, 0xe7, 0xcf, 0x9f, 0x24, 0xe2, 0xe2, 0x82, 0x09, 0x33, 0x33, 0xd3, 0x34, 0x7c, 0x0e, 0xa0, + 0xa1, 0xf0, 0x6d, 0xf2, 0x46, 0x20, 0xf8, 0x98, 0x83, 0xd7, 0xc7, 0xcd, 0xcc, 0xb6, 0xa7, 0xa1, + 0xe1, 0x67, 0xcf, 0x6a, 0x09, 0x85, 0xa2, 0x5d, 0x23, 0xd5, 0x40, 0xe5, 0x57, 0x4b, 0xe5, 0x9e, + 0x8d, 0x8b, 0xbf, 0x1d, 0x12, 0x2b, 0x66, 0x9a, 0x4f, 0x53, 0xe3, 0x0d, 0x0d, 0x45, 0x04, 0x9f, + 0x6f, 0x93, 0x06, 0xce, 0x9d, 0x04, 0x1b, 0xf6, 0x7a, 0x41, 0x08, 0x81, 0x07, 0x93, 0x05, 0x82, + 0x0f, 0x84, 0xe3, 0xe3, 0x8d, 0x1b, 0x00, 0x28, 0xe5, 0x98, 0xf4, 0xcc, 0x6a, 0x2e, 0x67, 0x4e, + 0x7d, 0x06, 0x1e, 0x07, 0xad, 0x5e, 0x7c, 0xf7, 0x29, 0x7d, 0x7e, 0x66, 0xa6, 0x95, 0xc8, 0xce, + 0x3e, 0x46, 0x30, 0x99, 0x4c, 0xa1, 0xae, 0xd5, 0x91, 0x7f, 0x20, 0x0e, 0x91, 0x5e, 0x5e, 0xae, + 0xc2, 0xa9, 0xa9, 0x96, 0x4d, 0x10, 0xd4, 0x62, 0x6d, 0x78, 0x35, 0x05, 0x21, 0x95, 0x6d, 0xb0, + 0xa2, 0x94, 0x5d, 0xce, 0xd7, 0x7e, 0xee, 0xe1, 0xc3, 0x72, 0x6a, 0x75, 0x89, 0x00, 0xdb, 0xa6, + 0x15, 0x16, 0xc6, 0xdb, 0xb8, 0xcf, 0x2d, 0x2d, 0x97, 0x88, 0x92, 0x92, 0x2c, 0xc2, 0xdd, 0x9d, + 0x9f, 0x96, 0x90, 0xf0, 0x39, 0xf9, 0x92, 0x06, 0x24, 0x8d, 0xaa, 0xdc, 0x08, 0x62, 0x2e, 0x2b, + 0xfb, 0xae, 0xe4, 0xe1, 0xdc, 0x9d, 0xc1, 0xa8, 0xca, 0xb2, 0xee, 0xb7, 0xc6, 0xaf, 0xcb, 0xf8, + 0x1d, 0xfd, 0x53, 0x97, 0xf2, 0xd1, 0x59, 0x77, 0x77, 0x27, 0x84, 0xc5, 0x81, 0x5d, 0x36, 0x1d, + 0xb4, 0x1f, 0xbd, 0xc0, 0xbd, 0x46, 0x20, 0xc8, 0x8f, 0xc7, 0xe3, 0x44, 0xe3, 0x6f, 0x91, 0x28, + 0x69, 0x2d, 0x3e, 0x93, 0xf5, 0x99, 0xab, 0x79, 0x3c, 0x39, 0x05, 0x5a, 0x29, 0xb6, 0xef, 0xc4, + 0x71, 0xd9, 0xbf, 0x17, 0xbe, 0x2b, 0xe9, 0x62, 0xa8, 0x29, 0x89, 0x5f, 0xbc, 0xf7, 0x27, 0x8e, + 0x0f, 0x0e, 0xde, 0x24, 0x76, 0xef, 0xb6, 0x48, 0x63, 0xb1, 0x58, 0xfe, 0x74, 0x50, 0x50, 0x58, + 0x98, 0x40, 0xd8, 0xd4, 0xf4, 0x13, 0x05, 0xda, 0xb6, 0x3e, 0xe1, 0x88, 0xff, 0x63, 0x96, 0xad, + 0xc5, 0x49, 0x92, 0xbd, 0x74, 0xcd, 0x57, 0xba, 0x58, 0xff, 0xc5, 0x2f, 0x0a, 0x79, 0xdb, 0x29, + 0x1c, 0x93, 0xf6, 0x7a, 0xfe, 0x41, 0x07, 0x95, 0x76, 0x19, 0x2e, 0x4d, 0xca, 0x6f, 0x64, 0xe1, + 0x5c, 0x5d, 0xdd, 0x0f, 0x94, 0xbd, 0x1d, 0xa4, 0x3d, 0x08, 0xde, 0xa1, 0xc8, 0xc8, 0x00, 0x02, + 0x93, 0xc0, 0xce, 0xce, 0x26, 0x9d, 0xc7, 0x63, 0xc7, 0x50, 0x4b, 0x46, 0x27, 0x42, 0x42, 0xbc, + 0x85, 0x5b, 0xc5, 0x0d, 0xd5, 0x36, 0x14, 0x7d, 0x95, 0x0e, 0xc2, 0x2d, 0xa4, 0xcf, 0x1f, 0x38, + 0xe0, 0x91, 0x8e, 0xe7, 0x90, 0x5a, 0x91, 0x03, 0x2c, 0x51, 0x28, 0x91, 0x14, 0x90, 0x29, 0xbd, + 0x73, 0xa7, 0x59, 0x3a, 0xec, 0x6f, 0x0a, 0x8c, 0xfb, 0xc3, 0xe1, 0x4c, 0x08, 0x0c, 0xf4, 0xd4, + 0x09, 0x7a, 0x29, 0xaf, 0xcf, 0x2c, 0xeb, 0x31, 0x1d, 0x5b, 0x5b, 0x0d, 0x73, 0xb9, 0x69, 0x20, + 0xf4, 0x3a, 0x7d, 0x9e, 0x16, 0x0e, 0x63, 0x86, 0x9d, 0x9d, 0x5d, 0x81, 0xad, 0xad, 0xad, 0x02, + 0xa4, 0xb2, 0xb7, 0xb7, 0x53, 0x39, 0x3a, 0xf2, 0x55, 0x7c, 0xbe, 0x83, 0x0a, 0xc6, 0x55, 0x0e, + 0x0e, 0xf6, 0x2a, 0x27, 0x27, 0xbe, 0xca, 0xd9, 0xd9, 0x51, 0xaf, 0x04, 0xfe, 0x6e, 0x63, 0xbd, + 0x93, 0xa5, 0xdf, 0x6a, 0x3b, 0x22, 0x97, 0xb7, 0x12, 0x78, 0x2e, 0x01, 0xe4, 0x82, 0xa0, 0x3a, + 0x90, 0xfa, 0xff, 0xc8, 0xc5, 0xc5, 0x59, 0x81, 0x86, 0x7b, 0x26, 0x1e, 0xe4, 0x1c, 0xbe, 0xfb, + 0x5c, 0xfa, 0x63, 0xcf, 0x93, 0x62, 0x0a, 0x86, 0x61, 0x31, 0x34, 0x34, 0x0c, 0x46, 0x50, 0xd7, + 0xfa, 0x0b, 0x4f, 0x40, 0xb1, 0x56, 0x56, 0x56, 0x31, 0xc6, 0xc6, 0xc6, 0x22, 0xb1, 0xf8, 0x6c, + 0x6e, 0x52, 0x52, 0xf4, 0x4d, 0xca, 0x58, 0x48, 0x88, 0xdf, 0x63, 0x99, 0x4c, 0x92, 0xdb, 0xd1, + 0x51, 0x91, 0x5f, 0x51, 0x71, 0xb6, 0x58, 0x24, 0x4a, 0xad, 0x0c, 0x0c, 0x14, 0x50, 0xef, 0xaa, + 0x1b, 0x5f, 0xdc, 0x11, 0x71, 0xc5, 0x43, 0x2a, 0xc6, 0xb5, 0x61, 0x35, 0xea, 0xb3, 0x66, 0x59, + 0x23, 0x82, 0xb2, 0xb2, 0x8e, 0x11, 0x26, 0x26, 0xbc, 0x18, 0x04, 0xc9, 0x41, 0x93, 0x20, 0x53, + 0x2a, 0x15, 0xc1, 0x83, 0x00, 0x1b, 0x1b, 0xab, 0x34, 0xa1, 0x30, 0xee, 0x77, 0xca, 0x50, 0x78, + 0x78, 0xc0, 0xa3, 0xcd, 0x5b, 0x73, 0xf7, 0x94, 0xb7, 0xf7, 0xfe, 0x3e, 0x9c, 0xf7, 0xbf, 0xda, + 0xd0, 0x46, 0x41, 0x50, 0xbc, 0xea, 0x21, 0xe5, 0xe8, 0xcc, 0xfd, 0xcc, 0xa2, 0xa2, 0x0c, 0x82, + 0xcb, 0xe5, 0x26, 0x22, 0x28, 0x15, 0xf4, 0x89, 0xd6, 0x29, 0xb6, 0xc4, 0x20, 0x9e, 0x38, 0x71, + 0x44, 0x2f, 0x68, 0x2d, 0x8d, 0x8b, 0x2e, 0xa0, 0x43, 0xde, 0xd5, 0xed, 0xf7, 0xe8, 0x20, 0xb6, + 0x78, 0x68, 0x5e, 0x36, 0xf9, 0x20, 0xbb, 0xb0, 0x30, 0x7d, 0x0d, 0xa4, 0xa3, 0x45, 0xb0, 0xa0, + 0x6e, 0xa5, 0x47, 0x46, 0x06, 0x69, 0x40, 0x89, 0x7b, 0x23, 0x66, 0xc7, 0x5d, 0xa4, 0x8f, 0x67, + 0xa4, 0x4d, 0xe7, 0xb6, 0x02, 0x36, 0x0c, 0x74, 0x8a, 0x98, 0x55, 0xc3, 0xcb, 0x14, 0xe8, 0xa3, + 0x86, 0x7f, 0xee, 0xe1, 0x78, 0x52, 0x52, 0x04, 0x61, 0x64, 0xc4, 0x39, 0xac, 0xb3, 0xac, 0x43, + 0x25, 0x4f, 0x0c, 0x0b, 0xf3, 0xd5, 0x80, 0x52, 0x76, 0x45, 0xa9, 0x47, 0x19, 0x35, 0xea, 0x31, + 0x6b, 0x49, 0xaf, 0xae, 0x74, 0x6f, 0x1a, 0x7c, 0xf4, 0xcd, 0xa7, 0xb7, 0xff, 0x6e, 0xc9, 0xe8, + 0xfc, 0xeb, 0x8a, 0x5c, 0xde, 0x4e, 0x1e, 0x6a, 0x81, 0xc0, 0x23, 0x1d, 0x1c, 0x17, 0xe8, 0x03, + 0x25, 0x87, 0x87, 0xfb, 0x6f, 0x02, 0xa1, 0x66, 0x6e, 0x37, 0x93, 0xa9, 0xac, 0x9c, 0xad, 0xc9, + 0x99, 0x1f, 0xf1, 0xba, 0xb5, 0x30, 0x68, 0xd3, 0x35, 0x37, 0x99, 0x59, 0xb4, 0x15, 0x1c, 0x7b, + 0x1a, 0x80, 0x5c, 0xf5, 0xae, 0x28, 0x38, 0xd8, 0x67, 0x33, 0x88, 0x53, 0x3b, 0xaf, 0x18, 0x68, + 0x23, 0xcb, 0xcc, 0xfc, 0xc0, 0x9e, 0xee, 0x85, 0x5e, 0x86, 0x9a, 0xd2, 0xdc, 0xd4, 0xb9, 0xef, + 0xe9, 0x10, 0x2c, 0xb0, 0xd8, 0x3a, 0x00, 0xf4, 0x0e, 0x43, 0x4f, 0x2b, 0xf7, 0x73, 0x75, 0x75, + 0x94, 0x68, 0x83, 0x26, 0x7c, 0xa4, 0xad, 0xe4, 0x6a, 0xa6, 0xcb, 0xbe, 0x5e, 0xe8, 0x33, 0x58, + 0xa1, 0x83, 0xe6, 0x47, 0xf6, 0xb5, 0xd2, 0x41, 0xb9, 0xb9, 0xf1, 0x04, 0xf6, 0x39, 0xb0, 0xc5, + 0xd5, 0x07, 0xb2, 0xb1, 0xb4, 0xb4, 0xd4, 0x80, 0x8e, 0x7e, 0x18, 0xd2, 0xfb, 0xb2, 0xb0, 0xa1, + 0x54, 0xd3, 0x0c, 0x5f, 0xd5, 0xe4, 0x2c, 0xf4, 0x1a, 0x2e, 0xd2, 0x41, 0xaa, 0x11, 0xef, 0x5b, + 0xd4, 0x7c, 0x77, 0xf7, 0xaf, 0x90, 0x6d, 0x2c, 0x8c, 0x8f, 0xd3, 0xa6, 0x3b, 0x83, 0xb6, 0xac, + 0xad, 0xad, 0x7f, 0xd6, 0x97, 0xde, 0x0b, 0xc3, 0xce, 0xf7, 0x5f, 0x83, 0x58, 0x0b, 0xca, 0xe9, + 0xd7, 0xcd, 0x30, 0x28, 0xc8, 0x13, 0x6b, 0x66, 0xcc, 0x96, 0x97, 0x13, 0x6d, 0x41, 0xfd, 0xcb, + 0xa1, 0x40, 0x50, 0x05, 0x9e, 0x6e, 0x15, 0x6c, 0xd5, 0xc4, 0xf1, 0xcb, 0xf3, 0xa3, 0x3e, 0x37, + 0x94, 0xaf, 0xc4, 0x5f, 0x92, 0x3d, 0x4a, 0x26, 0x21, 0x0e, 0x1e, 0xfc, 0x18, 0x57, 0x82, 0xb1, + 0xb1, 0x78, 0x23, 0x10, 0xbd, 0x0e, 0x42, 0xc1, 0x9d, 0xee, 0xef, 0xaf, 0x23, 0x74, 0xa5, 0x36, + 0xde, 0x1b, 0xb0, 0x51, 0x1a, 0x19, 0x71, 0xb1, 0xd5, 0xc4, 0x02, 0x64, 0x97, 0xce, 0xeb, 0x96, + 0x16, 0xc4, 0x6d, 0xbd, 0x3c, 0x69, 0x8a, 0xa7, 0x95, 0x95, 0x65, 0x55, 0x6c, 0x6c, 0xd0, 0x69, + 0x34, 0x88, 0x6d, 0x3f, 0x23, 0xe3, 0x28, 0x78, 0xef, 0x2d, 0xb4, 0xb5, 0xdd, 0x93, 0x0a, 0xf1, + 0x20, 0xef, 0x7c, 0x64, 0x2a, 0x33, 0x18, 0x06, 0x7a, 0xef, 0x75, 0x34, 0xc8, 0x73, 0x5d, 0x95, + 0x1a, 0xb6, 0x73, 0xd6, 0xdc, 0xdc, 0x94, 0x2c, 0x2b, 0xd0, 0xf2, 0x8f, 0x80, 0x51, 0x5f, 0xd0, + 0xfb, 0xa0, 0xbd, 0x20, 0x23, 0x5d, 0x8e, 0xff, 0x07, 0x01, 0x95, 0xbb, 0xf8, 0x62, 0x82, 0xb8, + 0x75, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE setcolor_silkscreen_xpm[1] = {{ png, sizeof( png ), "setcolor_silkscreen_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/setcolor_soldermask.cpp b/bitmaps_png/cpp_26/setcolor_soldermask.cpp new file mode 100644 index 0000000000..86f5f7e709 --- /dev/null +++ b/bitmaps_png/cpp_26/setcolor_soldermask.cpp @@ -0,0 +1,114 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +static const unsigned char png[] = { + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, + 0xce, 0x00, 0x00, 0x06, 0x08, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x8d, 0x96, 0x09, 0x4c, 0x54, + 0x47, 0x18, 0x80, 0xdf, 0xbd, 0x40, 0x14, 0xe5, 0x54, 0x04, 0x51, 0x10, 0x0d, 0x50, 0xd1, 0x6a, + 0x54, 0x50, 0xf1, 0x80, 0x8a, 0xac, 0x20, 0x20, 0x2c, 0xc8, 0x22, 0x2b, 0x52, 0x88, 0x80, 0xc8, + 0xb5, 0xf0, 0x40, 0x94, 0x1b, 0x01, 0x81, 0x6a, 0xb4, 0xd5, 0xa6, 0xd6, 0x82, 0xb5, 0xc5, 0x72, + 0x88, 0xd2, 0x7d, 0x4f, 0x50, 0x90, 0xaa, 0x78, 0x82, 0x45, 0x13, 0x05, 0xab, 0x88, 0xb1, 0x36, + 0x01, 0x6d, 0x6d, 0xc4, 0x6c, 0x95, 0x18, 0x01, 0xe1, 0xf5, 0x9f, 0x75, 0xd7, 0x6e, 0x71, 0x31, + 0x6c, 0xf2, 0xed, 0x31, 0xb3, 0xef, 0xff, 0xde, 0xcc, 0xfc, 0xf3, 0xcf, 0xc3, 0x30, 0x0c, 0x5b, + 0x09, 0x04, 0xe8, 0x20, 0x0c, 0x48, 0xc1, 0x71, 0xbc, 0x84, 0xa6, 0xa9, 0x83, 0x24, 0x49, 0x7e, + 0x4b, 0x10, 0x78, 0x39, 0x49, 0x12, 0x47, 0x28, 0x8a, 0x3a, 0x08, 0xed, 0x7b, 0xa0, 0x3f, 0x09, + 0x90, 0x6a, 0x5d, 0x33, 0x43, 0x10, 0x04, 0x4c, 0x17, 0xe8, 0x65, 0x82, 0x63, 0x58, 0x3c, 0x7c, + 0xca, 0x6d, 0x70, 0x3c, 0x79, 0x3a, 0x8e, 0xef, 0xb7, 0x24, 0x89, 0x93, 0x53, 0x71, 0x9c, 0x9b, + 0xa9, 0x2f, 0xfa, 0x79, 0xa9, 0xad, 0x25, 0x27, 0x5e, 0x60, 0xcf, 0xf9, 0x3a, 0xcf, 0xe5, 0x24, + 0xae, 0x0b, 0x38, 0x3f, 0x17, 0x27, 0xce, 0x63, 0xfe, 0x1c, 0x6e, 0xc9, 0x0c, 0x0b, 0xce, 0x8a, + 0xa6, 0x15, 0xe8, 0x7f, 0x56, 0x04, 0xf1, 0xdd, 0x44, 0x0c, 0x4b, 0x25, 0x30, 0x2c, 0x06, 0xe2, + 0x18, 0x8c, 0x25, 0x12, 0x01, 0x2e, 0x40, 0xe6, 0x06, 0x8a, 0xaa, 0x3d, 0x61, 0xa0, 0xa7, 0xe8, + 0x58, 0xe4, 0xc8, 0xbf, 0xf0, 0x73, 0xe3, 0x87, 0x36, 0x7b, 0xff, 0x47, 0xa8, 0xc7, 0x99, 0x11, + 0x7f, 0xbb, 0xdf, 0xde, 0x06, 0x3a, 0xb5, 0x0f, 0xc9, 0xbc, 0x54, 0x6d, 0x83, 0xf0, 0xd9, 0xe3, + 0xe1, 0xc2, 0x2b, 0x26, 0x1b, 0x2a, 0x8a, 0x68, 0xfa, 0x14, 0x89, 0x61, 0x45, 0xf8, 0xbb, 0x91, + 0xe9, 0x14, 0xa1, 0xd7, 0x2c, 0x82, 0x20, 0xca, 0x2d, 0x2c, 0x4c, 0x15, 0xed, 0xc1, 0x6b, 0xff, + 0x2f, 0x50, 0x49, 0x3c, 0x1b, 0x04, 0xb1, 0x68, 0x40, 0xf0, 0x24, 0x05, 0xc4, 0x88, 0x8f, 0x79, + 0xaf, 0x76, 0xff, 0x9b, 0x4d, 0xeb, 0xf8, 0x5b, 0xf3, 0xe6, 0xf0, 0x52, 0x92, 0xe4, 0x60, 0x7a, + 0x8f, 0x42, 0x3c, 0xd7, 0x0f, 0x44, 0xe8, 0x8d, 0x61, 0x98, 0xcd, 0x0b, 0x17, 0xda, 0xef, 0xfe, + 0x3c, 0x7c, 0xfd, 0xa9, 0x98, 0x4d, 0x62, 0xee, 0xc5, 0x28, 0xd1, 0x70, 0x80, 0xfd, 0x6d, 0x8d, + 0x44, 0xcd, 0xc8, 0xdb, 0x4d, 0xee, 0x4d, 0xa3, 0x6f, 0xe8, 0xef, 0xf5, 0x2b, 0xf8, 0x65, 0x46, + 0x86, 0x0a, 0xb8, 0xe9, 0x5a, 0x74, 0xf3, 0xa3, 0x47, 0x64, 0x03, 0xb0, 0x8d, 0x8d, 0x87, 0xd2, + 0x63, 0x63, 0x83, 0xf6, 0x99, 0x9b, 0x19, 0x29, 0x82, 0x1d, 0x6c, 0xf8, 0xe7, 0xbe, 0xab, 0xc7, + 0x25, 0xea, 0x8d, 0x71, 0x6a, 0xbf, 0xc9, 0x4e, 0xfc, 0xe7, 0x5e, 0xa2, 0xe5, 0xe3, 0xfe, 0x70, + 0xf7, 0xa6, 0xa7, 0x52, 0x31, 0x6f, 0x05, 0x32, 0x92, 0x20, 0xd0, 0xc8, 0x26, 0x68, 0x8b, 0x56, + 0xbb, 0xb8, 0x38, 0xc9, 0x79, 0x7e, 0x3f, 0x0b, 0xdf, 0x33, 0x80, 0x5d, 0x90, 0x59, 0x55, 0x32, + 0x82, 0xe0, 0xef, 0x2f, 0x9d, 0xff, 0xd1, 0xa9, 0x53, 0x46, 0xb8, 0x9e, 0xbf, 0x9a, 0x4e, 0x0a, + 0x1a, 0x3a, 0xe5, 0xef, 0xda, 0x2f, 0x05, 0xae, 0xe1, 0x0d, 0x60, 0xad, 0x21, 0x33, 0xb3, 0xde, + 0x8b, 0x20, 0x6d, 0x03, 0x22, 0x23, 0xfd, 0xd8, 0xfa, 0xfa, 0x2f, 0x91, 0x08, 0x31, 0x1d, 0x16, + 0x54, 0x46, 0x63, 0xd8, 0xde, 0x42, 0x8a, 0xe4, 0xff, 0x70, 0x5f, 0x32, 0x66, 0x32, 0x74, 0xc7, + 0xcf, 0x7c, 0xa0, 0x2d, 0xba, 0x96, 0x4e, 0x0d, 0xbf, 0x0e, 0xf3, 0x38, 0x83, 0xfa, 0x8a, 0x3c, + 0x9c, 0x79, 0x88, 0x85, 0x58, 0xa1, 0x12, 0xe9, 0xe9, 0x31, 0xb2, 0xd8, 0xd8, 0x8d, 0xec, 0x93, + 0x27, 0x4d, 0xac, 0xad, 0xad, 0xa5, 0x1c, 0xd6, 0x4b, 0x06, 0x9d, 0x76, 0x90, 0xaa, 0x71, 0x90, + 0xb2, 0x47, 0x97, 0x5b, 0x5b, 0x70, 0x69, 0xb0, 0x6e, 0xba, 0x48, 0x8a, 0x72, 0xbc, 0x19, 0x93, + 0x86, 0x09, 0x1a, 0xb6, 0xb1, 0x7a, 0xfd, 0xd0, 0xce, 0xa3, 0xbe, 0x64, 0x60, 0xda, 0x34, 0x33, + 0x34, 0x85, 0xc7, 0x20, 0xde, 0x64, 0x34, 0x75, 0x9f, 0x8a, 0x44, 0xa2, 0xe4, 0xa6, 0xa6, 0x83, + 0x6c, 0x67, 0x67, 0x2d, 0x6b, 0x6c, 0x3c, 0x31, 0x99, 0x61, 0x68, 0x39, 0xb4, 0x6f, 0x83, 0xa1, + 0x97, 0x83, 0xfc, 0xa7, 0x84, 0x04, 0x69, 0xa5, 0x2e, 0xe2, 0x13, 0x03, 0xab, 0x23, 0x0a, 0x0d, + 0x94, 0xe1, 0xc5, 0x98, 0x10, 0xbe, 0x07, 0x1f, 0x8e, 0xce, 0x98, 0x7b, 0x43, 0xbb, 0x3f, 0x28, + 0xc8, 0xa3, 0x12, 0xe2, 0x1c, 0x07, 0xc4, 0x48, 0x84, 0xc3, 0x4e, 0x47, 0x5f, 0x58, 0x5f, 0xdf, + 0x55, 0xc9, 0x68, 0xad, 0x8a, 0x8b, 0x13, 0x58, 0x07, 0x07, 0x9b, 0x5d, 0x12, 0x89, 0x7b, 0x5e, + 0x4d, 0xcd, 0x9e, 0xbc, 0xb6, 0xb6, 0x63, 0x63, 0x72, 0xbd, 0xad, 0x3c, 0xbf, 0xe6, 0x8a, 0xa4, + 0xe6, 0xdc, 0xf5, 0xec, 0x03, 0xba, 0xfa, 0x4d, 0x4c, 0x26, 0x65, 0x43, 0xec, 0x65, 0xda, 0xe9, + 0x67, 0xcd, 0x30, 0x24, 0x2a, 0x27, 0x6c, 0x41, 0x41, 0x2c, 0xab, 0x54, 0x5e, 0x4a, 0x7d, 0xf0, + 0xa0, 0x2e, 0xa3, 0xab, 0xab, 0x2e, 0x73, 0xbc, 0x5c, 0xee, 0xe0, 0xf2, 0x03, 0x4e, 0xb7, 0x36, + 0xe4, 0x5f, 0xbe, 0x50, 0xa6, 0x69, 0x93, 0x4a, 0xd7, 0x66, 0x42, 0x1e, 0xc8, 0x74, 0xed, 0x60, + 0x27, 0xd8, 0x07, 0x29, 0x17, 0x2f, 0x1e, 0x61, 0xfb, 0xfb, 0xaf, 0x8e, 0x9b, 0x5b, 0xcf, 0x6e, + 0xe4, 0x88, 0xaa, 0x7b, 0x5e, 0x63, 0x95, 0xbd, 0x02, 0xc2, 0xbd, 0xf9, 0x61, 0x0b, 0x6a, 0x2f, + 0x2a, 0x8a, 0x63, 0xf5, 0xf4, 0xf4, 0x22, 0x51, 0xe0, 0x49, 0x80, 0x99, 0x36, 0x20, 0x0a, 0xb5, + 0xb3, 0xb3, 0xca, 0x6a, 0x6f, 0xaf, 0xc8, 0x1d, 0x2f, 0x5e, 0xb5, 0x2d, 0xcd, 0x58, 0xc5, 0x63, + 0x41, 0x23, 0x62, 0xaa, 0x7b, 0xde, 0x74, 0x3f, 0x6f, 0xcd, 0xa8, 0xa8, 0xc8, 0x67, 0x69, 0x9a, + 0x4e, 0x40, 0x22, 0x5b, 0x54, 0x50, 0x47, 0x91, 0x83, 0x52, 0x53, 0x22, 0xf9, 0x8c, 0x0f, 0x09, + 0xf1, 0x1c, 0x17, 0xb3, 0x43, 0x63, 0xba, 0x30, 0xf6, 0xfb, 0xf7, 0x22, 0xaa, 0xaa, 0x67, 0xf0, + 0xee, 0xb3, 0xb6, 0xac, 0xb2, 0xb2, 0x2c, 0x56, 0x24, 0xa2, 0xe3, 0x55, 0xc9, 0x00, 0x78, 0x20, + 0x81, 0x61, 0x26, 0x29, 0x37, 0x3d, 0x4b, 0xc9, 0x4d, 0xeb, 0xa9, 0x14, 0xc3, 0x34, 0x52, 0xe1, + 0xd3, 0xe0, 0xcc, 0x6f, 0xbd, 0xe5, 0xc5, 0x27, 0xff, 0x18, 0xd0, 0xba, 0x7b, 0x6b, 0xd8, 0x8b, + 0x5c, 0x36, 0xb4, 0x27, 0xee, 0x8c, 0xdf, 0x2f, 0xa8, 0x6d, 0x34, 0x41, 0xb5, 0xfe, 0xe7, 0x08, + 0x59, 0xf6, 0x30, 0x56, 0xdc, 0xac, 0x12, 0xb9, 0x34, 0x3e, 0x6a, 0x43, 0x53, 0xb7, 0x63, 0xc7, + 0x16, 0x34, 0x75, 0x32, 0xcd, 0xba, 0x98, 0x60, 0x24, 0x16, 0x41, 0x5a, 0xe1, 0x49, 0xd3, 0x94, + 0x8c, 0xdc, 0x4a, 0x60, 0xe4, 0x66, 0xd5, 0x4c, 0x9d, 0xf7, 0xc3, 0x05, 0x7c, 0xe2, 0x73, 0xdf, + 0xc6, 0xbd, 0x29, 0x91, 0xc3, 0x7b, 0xe5, 0x91, 0x02, 0xa2, 0xa8, 0x64, 0x4b, 0xdf, 0xf6, 0x21, + 0x6f, 0x5e, 0x17, 0x01, 0x07, 0xfc, 0xcf, 0xcd, 0x0a, 0x8b, 0xef, 0xde, 0x5a, 0x7f, 0xfe, 0x84, + 0xf2, 0xe5, 0xd5, 0x54, 0x24, 0xf2, 0xf5, 0x5d, 0x99, 0xa2, 0x4a, 0x6f, 0xb5, 0x08, 0xf6, 0x27, + 0x36, 0x1b, 0xde, 0x13, 0x0c, 0x36, 0x12, 0x2a, 0x91, 0x69, 0x15, 0x53, 0xe7, 0xf3, 0xfb, 0x22, + 0x3e, 0xf3, 0x74, 0x70, 0xa7, 0x46, 0xa2, 0x41, 0xde, 0xbb, 0xa1, 0x19, 0x05, 0x4e, 0x1c, 0x5c, + 0x73, 0xb6, 0xf0, 0x95, 0xcd, 0xfd, 0x7d, 0x4a, 0x93, 0xbf, 0x76, 0xbe, 0x5e, 0x74, 0x6d, 0xdb, + 0x4b, 0x6f, 0x5e, 0x16, 0xbf, 0x8e, 0x8b, 0x8d, 0x0b, 0xaa, 0xee, 0xeb, 0xbb, 0x90, 0x86, 0x44, + 0xa8, 0x08, 0x40, 0x6c, 0x67, 0xed, 0x6c, 0x63, 0x80, 0xe5, 0x68, 0x0a, 0x8d, 0x8e, 0x52, 0x72, + 0xb3, 0x1a, 0xe6, 0x94, 0xe7, 0xfd, 0x79, 0xfc, 0x8e, 0x5f, 0x25, 0xad, 0xda, 0x92, 0x2f, 0xd2, + 0x22, 0x86, 0xe2, 0xfa, 0xd7, 0xd7, 0x23, 0xd1, 0x3e, 0xa5, 0xe9, 0xd3, 0x6f, 0xfa, 0x48, 0x41, + 0x43, 0xea, 0x9b, 0x65, 0x2d, 0xd1, 0x5d, 0x5e, 0x7c, 0x48, 0xa8, 0x98, 0x2b, 0x29, 0x49, 0x38, + 0xdc, 0xd7, 0x77, 0x91, 0xa5, 0x28, 0x02, 0x8d, 0x68, 0xce, 0xe8, 0xd4, 0x9e, 0x00, 0x2b, 0x16, + 0x88, 0xeb, 0x63, 0x49, 0xc6, 0x3f, 0x50, 0x47, 0x1c, 0x9b, 0xa7, 0x28, 0xb6, 0x0f, 0x7a, 0xf3, + 0xc5, 0x85, 0xe1, 0x4a, 0x8d, 0x28, 0xb7, 0x2a, 0xa4, 0x1b, 0x49, 0xe4, 0x03, 0x6e, 0x4d, 0x10, + 0x7c, 0x44, 0x5b, 0x54, 0xfc, 0xd2, 0xea, 0x11, 0xea, 0x8b, 0xa8, 0x5b, 0xa7, 0x4a, 0x90, 0xb0, + 0x30, 0xaf, 0x62, 0x9a, 0x26, 0x12, 0x21, 0xae, 0xbe, 0xae, 0x53, 0xd0, 0x02, 0xa3, 0xb0, 0x18, + 0xca, 0x11, 0x2f, 0x30, 0x3e, 0x46, 0x73, 0xc1, 0x7f, 0x2e, 0xe7, 0x91, 0x6c, 0x67, 0x4b, 0xd0, + 0x4d, 0xf6, 0x5e, 0xc0, 0x25, 0xcd, 0x7a, 0xc4, 0x0f, 0xac, 0x6d, 0xf8, 0xba, 0x8f, 0x1e, 0xd2, + 0x16, 0xed, 0x7e, 0x65, 0x7b, 0x4f, 0xd5, 0x0f, 0xff, 0x97, 0xa4, 0xbb, 0x71, 0x24, 0x4d, 0xd4, + 0xa1, 0xaa, 0xf0, 0xfe, 0xe0, 0x1b, 0x25, 0xa3, 0x80, 0x4f, 0x60, 0x64, 0x49, 0x06, 0x3e, 0x44, + 0x99, 0x71, 0x8e, 0x48, 0x11, 0x72, 0x6d, 0x15, 0x1f, 0xd5, 0xe1, 0xf5, 0x01, 0xf9, 0x77, 0xac, + 0xbb, 0x0f, 0xdd, 0x26, 0x04, 0xc4, 0x57, 0x77, 0xe8, 0x81, 0xed, 0x1d, 0x6e, 0x4d, 0x9a, 0x3e, + 0xfb, 0x22, 0x0b, 0x05, 0x88, 0x2a, 0x21, 0xc9, 0xa4, 0xaa, 0xcc, 0x1e, 0xe3, 0x41, 0x42, 0x1f, + 0x58, 0x83, 0x9e, 0x82, 0x60, 0xf3, 0x56, 0xa0, 0xb3, 0xc5, 0xdf, 0xdf, 0x4d, 0xe7, 0xfe, 0x89, + 0x8e, 0x5c, 0x78, 0x85, 0x8d, 0xb3, 0xbd, 0x2b, 0x93, 0xb9, 0x37, 0xa0, 0xdf, 0x3e, 0x3e, 0x2b, + 0x79, 0x4b, 0x4b, 0x73, 0x05, 0x5c, 0xcb, 0x01, 0xd9, 0xea, 0x7d, 0xe9, 0x8c, 0x7d, 0xe4, 0xf1, + 0xc8, 0x08, 0x70, 0x00, 0xe6, 0x43, 0xad, 0xca, 0xb0, 0xb6, 0x9e, 0x5a, 0x72, 0xf8, 0x70, 0x46, + 0xe9, 0xc9, 0x93, 0xa5, 0x3a, 0x39, 0x7e, 0xbc, 0xa0, 0x54, 0x2a, 0xf5, 0x2c, 0xa5, 0x69, 0xb2, + 0x04, 0x8a, 0x74, 0x9a, 0xaa, 0x90, 0xbe, 0xbb, 0x1e, 0x61, 0xf9, 0x31, 0x11, 0xae, 0x2e, 0x49, + 0x53, 0x50, 0xf5, 0x80, 0x8b, 0x93, 0x40, 0x98, 0x2b, 0x16, 0xbb, 0xe6, 0x45, 0x45, 0x49, 0xf2, + 0x52, 0x53, 0x37, 0xe7, 0x41, 0xc1, 0xcc, 0x5b, 0xbc, 0xd8, 0x31, 0x47, 0x5d, 0xa1, 0xf3, 0x20, + 0xc3, 0xd0, 0x09, 0xed, 0xa6, 0xbe, 0x46, 0x1b, 0xf3, 0x31, 0x45, 0x5a, 0x32, 0x42, 0x0d, 0x3c, + 0x4d, 0x61, 0x8e, 0x24, 0x89, 0xf9, 0xc0, 0x4e, 0xdf, 0x02, 0xd3, 0x19, 0x0d, 0x87, 0x64, 0x30, + 0xb4, 0xb9, 0xa3, 0x33, 0x0d, 0x3d, 0x3c, 0xaa, 0xa7, 0x9c, 0xd0, 0xc5, 0xbf, 0x0b, 0xe2, 0x8f, + 0x01, 0x5b, 0x03, 0xb6, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, + 0x82, +}; + +const BITMAP_OPAQUE setcolor_soldermask_xpm[1] = {{ png, sizeof( png ), "setcolor_soldermask_xpm" }}; + +//EOF diff --git a/bitmaps_png/sources/setcolor_3d_bg.svg b/bitmaps_png/sources/setcolor_3d_bg.svg new file mode 100644 index 0000000000..a3b5da9aff --- /dev/null +++ b/bitmaps_png/sources/setcolor_3d_bg.svg @@ -0,0 +1,1782 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/setcolor_copper.svg b/bitmaps_png/sources/setcolor_copper.svg new file mode 100644 index 0000000000..11991cb02e --- /dev/null +++ b/bitmaps_png/sources/setcolor_copper.svg @@ -0,0 +1,143 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/setcolor_silkscreen.svg b/bitmaps_png/sources/setcolor_silkscreen.svg new file mode 100644 index 0000000000..251de224be --- /dev/null +++ b/bitmaps_png/sources/setcolor_silkscreen.svg @@ -0,0 +1,100 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/setcolor_soldermask.svg b/bitmaps_png/sources/setcolor_soldermask.svg new file mode 100644 index 0000000000..cf72e93813 --- /dev/null +++ b/bitmaps_png/sources/setcolor_soldermask.svg @@ -0,0 +1,139 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f8275943e8f1da3b057b7f8c840a8b0a790bd40d Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 17 Jun 2015 11:06:39 +0200 Subject: [PATCH 4/4] 3D color selection : clean code. Add solder paste color selection --- 3d-viewer/3d_draw_helper_functions.cpp | 2 +- 3d-viewer/3d_frame.cpp | 175 +++++++++++++------------ 3d-viewer/3d_toolbar.cpp | 33 +++-- 3d-viewer/3d_viewer.h | 21 ++- 3d-viewer/3d_viewer_id.h | 4 +- 3d-viewer/info3d_visu.h | 1 + 6 files changed, 125 insertions(+), 111 deletions(-) diff --git a/3d-viewer/3d_draw_helper_functions.cpp b/3d-viewer/3d_draw_helper_functions.cpp index b2eaf87f18..71a1db6f6e 100644 --- a/3d-viewer/3d_draw_helper_functions.cpp +++ b/3d-viewer/3d_draw_helper_functions.cpp @@ -149,7 +149,7 @@ void EDA_3D_CANVAS::setGLTechLayersColor( LAYER_NUM aLayer ) { case B_Paste: case F_Paste: - SetGLColor( DARKGRAY, 0.7 ); + SetGLColor( GetPrm3DVisu().m_SolderPasteColor, 1 ); break; case B_SilkS: diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 7a243b34b4..9af2e3db1f 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -54,6 +54,10 @@ static const wxChar keySMaskColor_Red[] = wxT( "SMaskColor_Red" ); static const wxChar keySMaskColor_Green[] = wxT( "SMaskColor_Green" ); static const wxChar keySMaskColor_Blue[] = wxT( "SMaskColor_Blue" ); +static const wxChar keySPasteColor_Red[] = wxT( "SPasteColor_Red" ); +static const wxChar keySPasteColor_Green[] = wxT( "SPasteColor_Green" ); +static const wxChar keySPasteColor_Blue[] = wxT( "SPasteColor_Blue" ); + static const wxChar keySilkColor_Red[] = wxT( "SilkColor_Red" ); static const wxChar keySilkColor_Green[] = wxT( "SilkColor_Green" ); static const wxChar keySilkColor_Blue[] = wxT( "SilkColor_Blue" ); @@ -248,17 +252,25 @@ void EDA_3D_FRAME::LoadSettings( wxConfigBase* aCfg ) aCfg->Read( keyBgColor_Green_Top, &GetPrm3DVisu().m_BgColor_Top.m_Green, 0.8 ); aCfg->Read( keyBgColor_Blue_Top, &GetPrm3DVisu().m_BgColor_Top.m_Blue, 0.9 ); - aCfg->Read( keySMaskColor_Red, &GetPrm3DVisu().m_SolderMaskColor.m_Red, 100.0*(0.2/255.0) ); - aCfg->Read( keySMaskColor_Green, &GetPrm3DVisu().m_SolderMaskColor.m_Green, 255.0*(0.2/255.0) ); - aCfg->Read( keySMaskColor_Blue, &GetPrm3DVisu().m_SolderMaskColor.m_Blue, 180.0*(0.2/255.0) ); + // m_SolderMaskColor default value = dark grey-green + aCfg->Read( keySMaskColor_Red, &GetPrm3DVisu().m_SolderMaskColor.m_Red, 100.0 * 0.2 / 255.0 ); + aCfg->Read( keySMaskColor_Green, &GetPrm3DVisu().m_SolderMaskColor.m_Green, 255.0 * 0.2 / 255.0 ); + aCfg->Read( keySMaskColor_Blue, &GetPrm3DVisu().m_SolderMaskColor.m_Blue, 180.0 * 0.2 / 255.0 ); + // m_SolderPasteColor default value = light grey + aCfg->Read( keySPasteColor_Red, &GetPrm3DVisu().m_SolderPasteColor.m_Red, 128.0 /255.0 ); + aCfg->Read( keySPasteColor_Green, &GetPrm3DVisu().m_SolderPasteColor.m_Green, 128.0 /255.0 ); + aCfg->Read( keySPasteColor_Blue, &GetPrm3DVisu().m_SolderPasteColor.m_Blue, 128.0 /255.0 ); + + // m_SilkScreenColor default value = white aCfg->Read( keySilkColor_Red, &GetPrm3DVisu().m_SilkScreenColor.m_Red, 0.9 ); aCfg->Read( keySilkColor_Green, &GetPrm3DVisu().m_SilkScreenColor.m_Green, 0.9 ); aCfg->Read( keySilkColor_Blue, &GetPrm3DVisu().m_SilkScreenColor.m_Blue, 0.9 ); - aCfg->Read( keyCopperColor_Red, &GetPrm3DVisu().m_CopperColor.m_Red, 255.0*(0.7/255.0) ); - aCfg->Read( keyCopperColor_Green, &GetPrm3DVisu().m_CopperColor.m_Green, 223.0*(0.7/255.0) ); - aCfg->Read( keyCopperColor_Blue, &GetPrm3DVisu().m_CopperColor.m_Blue, 0.0*(0.7/255.0) ); + // m_CopperColor default value = gold + aCfg->Read( keyCopperColor_Red, &GetPrm3DVisu().m_CopperColor.m_Red, 255.0 * 0.7 / 255.0 ); + aCfg->Read( keyCopperColor_Green, &GetPrm3DVisu().m_CopperColor.m_Green, 223.0 * 0.7 / 255.0 ); + aCfg->Read( keyCopperColor_Blue, &GetPrm3DVisu().m_CopperColor.m_Blue, 0.0 /255.0 ); bool tmp; aCfg->Read( keyShowRealisticMode, &tmp, false ); @@ -343,6 +355,10 @@ void EDA_3D_FRAME::SaveSettings( wxConfigBase* aCfg ) aCfg->Write( keySMaskColor_Green, GetPrm3DVisu().m_SolderMaskColor.m_Green ); aCfg->Write( keySMaskColor_Blue, GetPrm3DVisu().m_SolderMaskColor.m_Blue ); + aCfg->Write( keySPasteColor_Red, GetPrm3DVisu().m_SolderPasteColor.m_Red ); + aCfg->Write( keySPasteColor_Green, GetPrm3DVisu().m_SolderPasteColor.m_Green ); + aCfg->Write( keySPasteColor_Blue, GetPrm3DVisu().m_SolderPasteColor.m_Blue ); + aCfg->Write( keySilkColor_Red, GetPrm3DVisu().m_SilkScreenColor.m_Red ); aCfg->Write( keySilkColor_Green, GetPrm3DVisu().m_SilkScreenColor.m_Green ); aCfg->Write( keySilkColor_Blue, GetPrm3DVisu().m_SilkScreenColor.m_Blue ); @@ -506,12 +522,14 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event ) m_canvas->TakeScreenshot( event ); break; - case ID_MENU3D_BGCOLOR_SELECTION: - Get3DColorFromUser( GetPrm3DVisu().m_BgColor ); + case ID_MENU3D_BGCOLOR_BOTTOM_SELECTION: + if( Set3DColorFromUser( GetPrm3DVisu().m_BgColor ) ) + m_canvas->Refresh( true ); return; case ID_MENU3D_BGCOLOR_TOP_SELECTION: - Get3DColorFromUser( GetPrm3DVisu().m_BgColor_Top ); + if( Set3DColorFromUser( GetPrm3DVisu().m_BgColor_Top ) ) + m_canvas->Refresh( true ); return; case ID_MENU3D_SILKSCREEN_COLOR_SELECTION: @@ -519,7 +537,11 @@ void EDA_3D_FRAME::Process_Special_Functions( wxCommandEvent& event ) return; case ID_MENU3D_SOLDERMASK_COLOR_SELECTION: - Set3DSoldermaskColorFromUser(); + Set3DSolderMaskColorFromUser(); + return; + + case ID_MENU3D_SOLDERPASTE_COLOR_SELECTION: + Set3DSolderPasteColorFromUser(); return; case ID_MENU3D_COPPER_COLOR_SELECTION: @@ -708,26 +730,29 @@ void EDA_3D_FRAME::OnActivate( wxActivateEvent& event ) /* called to set the background color of the 3D scene */ -bool EDA_3D_FRAME::Get3DColorFromUser( S3D_COLOR &color ) +bool EDA_3D_FRAME::Set3DColorFromUser( S3D_COLOR &aColor, wxColourData* aPredefinedColors ) { - wxColour newcolor, oldcolor; + wxColour newcolor, oldcolor; - oldcolor.Set( KiROUND( color.m_Red * 255 ), - KiROUND( color.m_Green * 255 ), - KiROUND( color.m_Blue * 255 ) ); + oldcolor.Set( KiROUND( aColor.m_Red * 255 ), + KiROUND( aColor.m_Green * 255 ), + KiROUND( aColor.m_Blue * 255 ) ); - newcolor = wxGetColourFromUser( this, oldcolor ); + if( aPredefinedColors ) + newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, aPredefinedColors ); + else + newcolor = wxGetColourFromUser( this, oldcolor ); if( !newcolor.IsOk() ) // Cancel command return false; if( newcolor != oldcolor ) { - color.m_Red = (double) newcolor.Red() / 255.0; - color.m_Green = (double) newcolor.Green() / 255.0; - color.m_Blue = (double) newcolor.Blue() / 255.0; - m_canvas->Redraw(); + aColor.m_Red = (double) newcolor.Red() / 255.0; + aColor.m_Green = (double) newcolor.Green() / 255.0; + aColor.m_Blue = (double) newcolor.Blue() / 255.0; } + return true; } @@ -735,67 +760,39 @@ bool EDA_3D_FRAME::Get3DColorFromUser( S3D_COLOR &color ) */ bool EDA_3D_FRAME::Set3DSilkScreenColorFromUser() { - S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SilkScreenColor; - wxColour oldcolor; - oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), - KiROUND( curr_3Dcolor.m_Green * 255 ), - KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + wxColourData definedColors; - wxColourData colorData; + definedColors.SetCustomColour(0, wxColour(241, 241, 241)); // White + definedColors.SetCustomColour(1, wxColour(180, 180, 180 )); // Gray - colorData.SetCustomColour(0, wxColour(241, 241, 241)); // White - colorData.SetCustomColour(1, wxColour(180, 180, 180 )); // Gray + bool change = Set3DColorFromUser( GetPrm3DVisu().m_SilkScreenColor, &definedColors ); - wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); - - if( !newcolor.IsOk() ) // Cancel command - return false; - - if( newcolor != oldcolor ) - { - curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; - curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; - curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + if( change ) NewDisplay(GL_ID_TECH_LAYERS); - } - return true; + return change; } /* called to set the soldermask color. Sets up a number of default colors */ -bool EDA_3D_FRAME::Set3DSoldermaskColorFromUser() +bool EDA_3D_FRAME::Set3DSolderMaskColorFromUser() { - S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_SolderMaskColor; - wxColour oldcolor; - oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), - KiROUND( curr_3Dcolor.m_Green * 255 ), - KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + wxColourData definedColors; - wxColourData colorData; + definedColors.SetCustomColour(0, wxColour(20, 51, 36 )); // Green + definedColors.SetCustomColour(1, wxColour(43, 10, 65 )); // Purple + definedColors.SetCustomColour(2, wxColour(117, 19, 21 )); // Red + definedColors.SetCustomColour(3, wxColour(54, 79, 116)); // Light blue + definedColors.SetCustomColour(4, wxColour(11, 11, 11 )); // Black + definedColors.SetCustomColour(5, wxColour(241, 241,241)); // White - colorData.SetCustomColour(0, wxColour(20, 51, 36 )); // Green - colorData.SetCustomColour(1, wxColour(43, 10, 65 )); // Purple - colorData.SetCustomColour(2, wxColour(117, 19, 21 )); // Red - colorData.SetCustomColour(3, wxColour(54, 79, 116)); // Light blue - colorData.SetCustomColour(4, wxColour(11, 11, 11 )); // Black - colorData.SetCustomColour(5, wxColour(241, 241,241)); // White + bool change = Set3DColorFromUser( GetPrm3DVisu().m_SolderMaskColor, &definedColors ); - wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); - - if( !newcolor.IsOk() ) // Cancel command - return false; - - if( newcolor != oldcolor ) - { - curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; - curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; - curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + if( change ) NewDisplay(GL_ID_TECH_LAYERS); - } - return true; + return change; } @@ -803,32 +800,36 @@ bool EDA_3D_FRAME::Set3DSoldermaskColorFromUser() */ bool EDA_3D_FRAME::Set3DCopperColorFromUser() { - S3D_COLOR& curr_3Dcolor = GetPrm3DVisu().m_CopperColor; - wxColour oldcolor; - oldcolor.Set( KiROUND( curr_3Dcolor.m_Red * 255 ), - KiROUND( curr_3Dcolor.m_Green * 255 ), - KiROUND( curr_3Dcolor.m_Blue * 255 ) ); + wxColourData definedColors; - wxColourData colorData; + definedColors.SetCustomColour(0, wxColour(255, 223, 0 )); // Copper + definedColors.SetCustomColour(1, wxColour(233, 221, 82 )); // Gold + definedColors.SetCustomColour(2, wxColour(213, 213, 213)); // Silver - colorData.SetCustomColour(0, wxColour(255, 223, 0 )); // Copper - colorData.SetCustomColour(1, wxColour(233, 221, 82 )); // Gold - colorData.SetCustomColour(2, wxColour(213, 213, 213)); // Silver + bool change = Set3DColorFromUser( GetPrm3DVisu().m_CopperColor, &definedColors ); - wxColour newcolor = wxGetColourFromUser( this, oldcolor, wxEmptyString, &colorData); - - if( !newcolor.IsOk() ) // Cancel command - return false; - - if( newcolor != oldcolor ) - { - curr_3Dcolor.m_Red = (double) newcolor.Red() / 255.0; - curr_3Dcolor.m_Green = (double) newcolor.Green() / 255.0; - curr_3Dcolor.m_Blue = (double) newcolor.Blue() / 255.0; + if( change ) NewDisplay(GL_ID_TECH_LAYERS); - } - return true; + return change; +} + +/* called to set the solder paste layer color. Sets up a number of default colors + */ +bool EDA_3D_FRAME::Set3DSolderPasteColorFromUser() +{ + wxColourData definedColors; + + definedColors.SetCustomColour(0, wxColour(128, 128, 128 )); // grey + definedColors.SetCustomColour(1, wxColour(213, 213, 213)); // Silver + definedColors.SetCustomColour(2, wxColour(90, 90, 90)); // grey 2 + + bool change = Set3DColorFromUser( GetPrm3DVisu().m_SolderPasteColor, &definedColors ); + + if( change ) + NewDisplay(GL_ID_TECH_LAYERS); + + return change; } @@ -841,7 +842,7 @@ BOARD* EDA_3D_FRAME::GetBoard() INFO3D_VISU& EDA_3D_FRAME::GetPrm3DVisu() const { // return the INFO3D_VISU which contains the current parameters - // to draw the 3D view og the board + // to draw the 3D view of the board return g_Parm_3D_Visu; } diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 8224ceb42c..8765f48d65 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -186,36 +186,33 @@ void EDA_3D_FRAME::CreateMenuBar() prefsMenu->AppendSeparator(); - wxMenu * backgrounColorMenu = new wxMenu; + // Add submenu set Colors + wxMenu * setColorMenu = new wxMenu; + AddMenuItem( prefsMenu, setColorMenu, ID_MENU3D_COLOR, + _( "Choose Colors" ), KiBitmap( palette_xpm ) ); - // Add submenu Choose Colors - AddMenuItem( prefsMenu, backgrounColorMenu, ID_MENU3D_COLOR, - _( "Choose Colors" ), KiBitmap( palette_xpm ) ); + wxMenu * setBgColorMenu = new wxMenu; + AddMenuItem( setColorMenu, setBgColorMenu, ID_MENU3D_BGCOLOR, + _( "Background Color" ), KiBitmap( palette_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_TOP_SELECTION, + AddMenuItem( setBgColorMenu, ID_MENU3D_BGCOLOR_TOP_SELECTION, _( "Background Top Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION, + AddMenuItem( setBgColorMenu, ID_MENU3D_BGCOLOR_BOTTOM_SELECTION, _( "Background Bottom Color" ), KiBitmap( setcolor_3d_bg_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, + AddMenuItem( setColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, _( "Silkscreen Color" ), KiBitmap( setcolor_silkscreen_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, + AddMenuItem( setColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, _( "Solder Mask Color" ), KiBitmap( setcolor_soldermask_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, + AddMenuItem( setColorMenu, ID_MENU3D_SOLDERPASTE_COLOR_SELECTION, + _( "Solder Paste Color" ), KiBitmap( setcolor_soldermask_xpm ) ); + + AddMenuItem( setColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, _( "Copper/Surface Finish Color" ), KiBitmap( setcolor_copper_xpm ) ); - AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, - _( "Silkscreen Color" ), KiBitmap( palette_xpm ) ); - - AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, - _( "Solder Mask Color" ), KiBitmap( palette_xpm ) ); - - AddMenuItem( backgrounColorMenu, ID_MENU3D_COPPER_COLOR_SELECTION, - _( "Copper/Surface Finish Color" ), KiBitmap( palette_xpm ) ); - AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF, _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK ); diff --git a/3d-viewer/3d_viewer.h b/3d-viewer/3d_viewer.h index f0722fc974..7f131bd39f 100644 --- a/3d-viewer/3d_viewer.h +++ b/3d-viewer/3d_viewer.h @@ -50,6 +50,7 @@ class EDA_3D_CANVAS; class PCB_BASE_FRAME; +class wxColourData; #define KICAD_DEFAULT_3D_DRAWFRAME_STYLE (wxDEFAULT_FRAME_STYLE | wxWANTS_CHARS) @@ -146,20 +147,32 @@ private: void RedrawActiveWindow( wxDC* DC, bool EraseBg ); /** - * Function Get3DColorFromUser + * Function Set3DColorFromUser * Get a S3D_COLOR from a wx colour dialog + * @param aColor is the S3D_COLOR to change + * @param aPredefinedColors is a reference to a wxColourData + * which contains a few predefined colors + * if it is NULL, no predefined colors are used * @return true if a new color is chosen, false if * no change or aborted by user */ - bool Get3DColorFromUser( S3D_COLOR &color ); + bool Set3DColorFromUser( S3D_COLOR &aColor, wxColourData* aPredefinedColors = NULL ); /** - * Function Set3DSoldermaskColorFromUser + * Function Set3DSolderMaskColorFromUser * Set the solder mask color from a set of colors * @return true if a new color is chosen, false if * no change or aborted by user */ - bool Set3DSoldermaskColorFromUser(); + bool Set3DSolderMaskColorFromUser(); + + /** + * Function Set3DSolderPasteColorFromUser + * Set the solder mask color from a set of colors + * @return true if a new color is chosen, false if + * no change or aborted by user + */ + bool Set3DSolderPasteColorFromUser(); /** * Function Set3DCopperColorFromUser diff --git a/3d-viewer/3d_viewer_id.h b/3d-viewer/3d_viewer_id.h index 75c4c3f0f0..154053a6ca 100644 --- a/3d-viewer/3d_viewer_id.h +++ b/3d-viewer/3d_viewer_id.h @@ -31,10 +31,12 @@ enum id_3dview_frm ID_MOVE3D_DOWN, ID_ORTHO, ID_MENU3D_COLOR, - ID_MENU3D_BGCOLOR_SELECTION, + ID_MENU3D_BGCOLOR, + ID_MENU3D_BGCOLOR_BOTTOM_SELECTION, ID_MENU3D_BGCOLOR_TOP_SELECTION, ID_MENU3D_SILKSCREEN_COLOR_SELECTION, ID_MENU3D_SOLDERMASK_COLOR_SELECTION, + ID_MENU3D_SOLDERPASTE_COLOR_SELECTION, ID_MENU3D_COPPER_COLOR_SELECTION, ID_MENU3D_USE_COPPER_THICKNESS, ID_MENU3D_AXIS_ONOFF, diff --git a/3d-viewer/info3d_visu.h b/3d-viewer/info3d_visu.h index e5f4d1c7fc..b1d8f4848c 100644 --- a/3d-viewer/info3d_visu.h +++ b/3d-viewer/info3d_visu.h @@ -96,6 +96,7 @@ public: S3D_COLOR m_BgColor_Top; S3D_COLOR m_BoardBodyColor; // in realistic mode: FR4 board color S3D_COLOR m_SolderMaskColor; // in realistic mode: solder mask color + S3D_COLOR m_SolderPasteColor; // in realistic mode: solder paste color S3D_COLOR m_SilkScreenColor; // in realistic mode: SilkScreen color S3D_COLOR m_CopperColor; // in realistic mode: copper color wxPoint m_BoardPos; // center board actual position in board units