diff --git a/INSTALL.txt b/INSTALL.txt
index d35af5723a..f128444e30 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -106,9 +106,9 @@ Installation from source code
Some dependencies must be satisfied for the correct installation of KiCad:
-wxWidgets >= 2.6.3.3 http://www.wxwidgets.org/
-CMake >= 2.4.6 http://www.cmake.org/
-Boost C++ Libraries http://www.boost.org/
+wxWidgets >= 2.8.11 http://www.wxwidgets.org/
+CMake >= 2.6.4 http://www.cmake.org/
+Boost C++ Libraries (files used by kicad are provided in kicad sources) http://www.boost.org/
OpenGL
Linux: Mesa 3D Graphics Library http://www.mesa3d.org/
Windows: built-in
diff --git a/bitmap2component/gui_bm2cmp.cpp b/bitmap2component/gui_bm2cmp.cpp
deleted file mode 100644
index 729b324d5c..0000000000
--- a/bitmap2component/gui_bm2cmp.cpp
+++ /dev/null
@@ -1,1122 +0,0 @@
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
- #include "wx/wx.h"
-#endif
-
-#include "wx/image.h"
-#include "wx/file.h"
-#include "wx/filename.h"
-#include "wx/mstream.h"
-#include "wx/wfstream.h"
-#include "wx/quantize.h"
-
-#if wxUSE_CLIPBOARD
- #include "wx/dataobj.h"
- #include "wx/clipbrd.h"
-#endif // wxUSE_CLIPBOARD
-
-#if defined(__WXMSW__)
- #ifdef wxHAVE_RAW_BITMAP
- #include "wx/rawbmp.h"
- #endif
-#endif
-
-#if defined(__WXMAC__) || defined(__WXGTK__)
- #define wxHAVE_RAW_BITMAP
- #include "wx/rawbmp.h"
-#endif
-
-// derived classes
-
-class BM_TO_CMP_FRAME;
-class BM_TO_CMP_APP;
-
-// MyCanvas
-
-class MyCanvas: public wxScrolledWindow
-{
-public:
- MyCanvas( wxWindow *parent, wxWindowID, const wxPoint &pos, const wxSize &size );
- ~MyCanvas();
-
-private:
- void OnPaint( wxPaintEvent &event );
-
- DECLARE_EVENT_TABLE()
-};
-
-
-// BM_TO_CMP_FRAME
-
-
-class BM_TO_CMP_FRAME: public wxFrame
-{
-public:
- BM_TO_CMP_FRAME();
-
- void OnAbout( wxCommandEvent &event );
- void OnNewFrame( wxCommandEvent &event );
-#ifdef wxHAVE_RAW_BITMAP
- void OnTestRawBitmap( wxCommandEvent &event );
-#endif // wxHAVE_RAW_BITMAP
- void OnQuit( wxCommandEvent &event );
-
-#if wxUSE_CLIPBOARD
- void OnCopy(wxCommandEvent& event);
- void OnPaste(wxCommandEvent& event);
-#endif // wxUSE_CLIPBOARD
-
- MyCanvas *m_canvas;
-
-private:
- DECLARE_DYNAMIC_CLASS(BM_TO_CMP_FRAME)
- DECLARE_EVENT_TABLE()
-};
-
-class MyImageFrame : public wxFrame
-{
-public:
- MyImageFrame(wxFrame *parent, const wxBitmap& bitmap)
- : wxFrame(parent, wxID_ANY, _T("Double click to save"),
- wxDefaultPosition, wxDefaultSize,
- wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX),
- m_bitmap(bitmap)
- {
- SetClientSize(bitmap.GetWidth(), bitmap.GetHeight());
- }
-
- void OnEraseBackground(wxEraseEvent& WXUNUSED(event))
- {
- // do nothing here to be able to see how transparent images are shown
- }
-
- void OnPaint(wxPaintEvent& WXUNUSED(event))
- {
- wxPaintDC dc( this );
- dc.DrawBitmap( m_bitmap, 0, 0, true /* use mask */ );
- }
-
- void OnSave(wxMouseEvent& WXUNUSED(event))
- {
-#if wxUSE_FILEDLG
- wxImage image = m_bitmap.ConvertToImage();
-
- wxString savefilename = wxFileSelector( wxT("Save Image"),
- wxEmptyString,
- wxEmptyString,
- (const wxChar *)NULL,
- wxT("BMP files (*.bmp)|*.bmp|")
- wxT("PNG files (*.png)|*.png|")
- wxT("JPEG files (*.jpg)|*.jpg|")
- wxT("GIF files (*.gif)|*.gif|")
- wxT("TIFF files (*.tif)|*.tif|")
- wxT("PCX files (*.pcx)|*.pcx|")
- wxT("ICO files (*.ico)|*.ico|")
- wxT("CUR files (*.cur)|*.cur"),
- wxFD_SAVE,
- this);
-
- if ( savefilename.empty() )
- return;
-
- wxString extension;
- wxFileName::SplitPath(savefilename, NULL, NULL, &extension);
-
- bool saved = false;
- if ( extension == _T("bmp") )
- {
- static const int bppvalues[] =
- {
- wxBMP_1BPP,
- wxBMP_1BPP_BW,
- wxBMP_4BPP,
- wxBMP_8BPP,
- wxBMP_8BPP_GREY,
- wxBMP_8BPP_RED,
- wxBMP_8BPP_PALETTE,
- wxBMP_24BPP
- };
-
- const wxString bppchoices[] =
- {
- _T("1 bpp color"),
- _T("1 bpp B&W"),
- _T("4 bpp color"),
- _T("8 bpp color"),
- _T("8 bpp greyscale"),
- _T("8 bpp red"),
- _T("8 bpp own palette"),
- _T("24 bpp")
- };
-
- int bppselection = wxGetSingleChoiceIndex(_T("Set BMP BPP"),
- _T("Image sample: save file"),
- WXSIZEOF(bppchoices),
- bppchoices,
- this);
- if ( bppselection != -1 )
- {
- int format = bppvalues[bppselection];
- image.SetOption(wxIMAGE_OPTION_BMP_FORMAT, format);
-
- if ( format == wxBMP_8BPP_PALETTE )
- {
- unsigned char *cmap = new unsigned char [256];
- for ( int i = 0; i < 256; i++ )
- cmap[i] = (unsigned char)i;
- image.SetPalette(wxPalette(256, cmap, cmap, cmap));
-
- delete[] cmap;
- }
- }
- }
- else if ( extension == _T("png") )
- {
- static const int pngvalues[] =
- {
- wxPNG_TYPE_COLOUR,
- wxPNG_TYPE_COLOUR,
- wxPNG_TYPE_GREY,
- wxPNG_TYPE_GREY,
- wxPNG_TYPE_GREY_RED,
- wxPNG_TYPE_GREY_RED,
- };
-
- const wxString pngchoices[] =
- {
- _T("Colour 8bpp"),
- _T("Colour 16bpp"),
- _T("Grey 8bpp"),
- _T("Grey 16bpp"),
- _T("Grey red 8bpp"),
- _T("Grey red 16bpp"),
- };
-
- int sel = wxGetSingleChoiceIndex(_T("Set PNG format"),
- _T("Image sample: save file"),
- WXSIZEOF(pngchoices),
- pngchoices,
- this);
- if ( sel != -1 )
- {
- image.SetOption(wxIMAGE_OPTION_PNG_FORMAT, pngvalues[sel]);
- image.SetOption(wxIMAGE_OPTION_PNG_BITDEPTH, sel % 2 ? 16 : 8);
- }
- }
- else if ( extension == _T("cur") )
- {
- image.Rescale(32,32);
- image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_X, 0);
- image.SetOption(wxIMAGE_OPTION_CUR_HOTSPOT_Y, 0);
- // This shows how you can save an image with explicitly
- // specified image format:
- saved = image.SaveFile(savefilename, wxBITMAP_TYPE_CUR);
- }
-
- if ( !saved )
- {
- // This one guesses image format from filename extension
- // (it may fail if the extension is not recognized):
- image.SaveFile(savefilename);
- }
-#endif // wxUSE_FILEDLG
- }
-
-private:
- wxBitmap m_bitmap;
-
- DECLARE_EVENT_TABLE()
-};
-
-#ifdef wxHAVE_RAW_BITMAP
-
-#include "wx/rawbmp.h"
-
-class MyRawBitmapFrame : public wxFrame
-{
-public:
- enum
- {
- BORDER = 15,
- SIZE = 150,
- REAL_SIZE = SIZE - 2*BORDER
- };
-
- MyRawBitmapFrame(wxFrame *parent)
- : wxFrame(parent, wxID_ANY, _T("Raw bitmaps (how exciting)")),
- m_bitmap(SIZE, SIZE, 24),
- m_alphaBitmap(SIZE, SIZE, 32)
- {
- SetClientSize(SIZE, SIZE*2+25);
-
- InitAlphaBitmap();
- InitBitmap();
-
- }
-
- void InitAlphaBitmap()
- {
- // First, clear the whole bitmap by making it alpha
- {
- wxAlphaPixelData data( m_alphaBitmap, wxPoint(0,0), wxSize(SIZE, SIZE) );
- if ( !data )
- {
- wxLogError(_T("Failed to gain raw access to bitmap data"));
- return;
- }
- data.UseAlpha();
- wxAlphaPixelData::Iterator p(data);
- for ( int y = 0; y < SIZE; ++y )
- {
- wxAlphaPixelData::Iterator rowStart = p;
- for ( int x = 0; x < SIZE; ++x )
- {
- p.Alpha() = 0;
- ++p; // same as p.OffsetX(1)
- }
- p = rowStart;
- p.OffsetY(data, 1);
- }
- }
-
- // Then, draw colourful alpha-blended stripes
- wxAlphaPixelData data(m_alphaBitmap, wxPoint(BORDER, BORDER),
- wxSize(REAL_SIZE, REAL_SIZE));
- if ( !data )
- {
- wxLogError(_T("Failed to gain raw access to bitmap data"));
- return;
- }
-
- data.UseAlpha();
- wxAlphaPixelData::Iterator p(data);
-
- for ( int y = 0; y < REAL_SIZE; ++y )
- {
- wxAlphaPixelData::Iterator rowStart = p;
-
- int r = y < REAL_SIZE/3 ? 255 : 0,
- g = (REAL_SIZE/3 <= y) && (y < 2*(REAL_SIZE/3)) ? 255 : 0,
- b = 2*(REAL_SIZE/3) <= y ? 255 : 0;
-
- for ( int x = 0; x < REAL_SIZE; ++x )
- {
- // note that RGB must be premultiplied by alpha
- unsigned a = (wxAlphaPixelData::Iterator::ChannelType)((x*255.)/REAL_SIZE);
- p.Red() = r * a / 256;
- p.Green() = g * a / 256;
- p.Blue() = b * a / 256;
- p.Alpha() = a;
-
- ++p; // same as p.OffsetX(1)
- }
-
- p = rowStart;
- p.OffsetY(data, 1);
- }
- }
-
- void InitBitmap()
- {
- // draw some colourful stripes without alpha
- wxNativePixelData data(m_bitmap);
- if ( !data )
- {
- wxLogError(_T("Failed to gain raw access to bitmap data"));
- return;
- }
-
- wxNativePixelData::Iterator p(data);
- for ( int y = 0; y < SIZE; ++y )
- {
- wxNativePixelData::Iterator rowStart = p;
-
- int r = y < SIZE/3 ? 255 : 0,
- g = (SIZE/3 <= y) && (y < 2*(SIZE/3)) ? 255 : 0,
- b = 2*(SIZE/3) <= y ? 255 : 0;
-
- for ( int x = 0; x < SIZE; ++x )
- {
- p.Red() = r;
- p.Green() = g;
- p.Blue() = b;
- ++p; // same as p.OffsetX(1)
- }
-
- p = rowStart;
- p.OffsetY(data, 1);
- }
- }
-
- void OnPaint(wxPaintEvent& WXUNUSED(event))
- {
- wxPaintDC dc( this );
- dc.DrawText(_T("This is alpha and raw bitmap test"), 0, BORDER);
- dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE/2 - BORDER);
- dc.DrawText(_T("This is alpha and raw bitmap test"), 0, SIZE - 2*BORDER);
- dc.DrawBitmap( m_alphaBitmap, 0, 0, true /* use mask */ );
-
- dc.DrawText(_T("Raw bitmap access without alpha"), 0, SIZE+5);
- dc.DrawBitmap( m_bitmap, 0, SIZE+5+dc.GetCharHeight());
- }
-
-private:
- wxBitmap m_bitmap;
- wxBitmap m_alphaBitmap;
-
- DECLARE_EVENT_TABLE()
-};
-
-#endif // wxHAVE_RAW_BITMAP
-
-// BM_TO_CMP_APP
-
-class BM_TO_CMP_APP: public wxApp
-{
-public:
- virtual bool OnInit();
-};
-
-// main program
-
-IMPLEMENT_APP(BM_TO_CMP_APP)
-
-// MyCanvas
-
-BEGIN_EVENT_TABLE(MyImageFrame, wxFrame)
- EVT_ERASE_BACKGROUND(MyImageFrame::OnEraseBackground)
- EVT_PAINT(MyImageFrame::OnPaint)
- EVT_LEFT_DCLICK(MyImageFrame::OnSave)
-END_EVENT_TABLE()
-
-#ifdef wxHAVE_RAW_BITMAP
-
-BEGIN_EVENT_TABLE(MyRawBitmapFrame, wxFrame)
- EVT_PAINT(MyRawBitmapFrame::OnPaint)
-END_EVENT_TABLE()
-
-#endif // wxHAVE_RAW_BITMAP
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
- EVT_PAINT(MyCanvas::OnPaint)
-END_EVENT_TABLE()
-
-MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
- const wxPoint &pos, const wxSize &size )
- : wxScrolledWindow( parent, id, pos, size, wxSUNKEN_BORDER )
- , m_bmpSmileXpm(smile_xpm)
- , m_iconSmileXpm(smile_xpm)
-{
- my_horse_ani = NULL;
- m_ani_images = 0 ;
-
- SetBackgroundColour(* wxWHITE);
-
- wxBitmap bitmap( 100, 100 );
-
- wxMemoryDC dc;
- dc.SelectObject( bitmap );
- dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawRectangle( 0, 0, 100, 100 );
- dc.SetBrush( *wxWHITE_BRUSH );
- dc.DrawRectangle( 20, 20, 60, 60 );
- dc.SelectObject( wxNullBitmap );
-
- // try to find the directory with our images
- wxString dir;
- if ( wxFile::Exists(wxT("./horse.png")) )
- dir = wxT("./");
- else if ( wxFile::Exists(wxT("../horse.png")) )
- dir = wxT("../");
- else
- wxLogWarning(wxT("Can't find image files in either '.' or '..'!"));
-
- wxImage image = bitmap.ConvertToImage();
-
-#if wxUSE_LIBPNG
- if ( !image.SaveFile( dir + _T("test.png"), wxBITMAP_TYPE_PNG ))
- wxLogError(wxT("Can't save file"));
-
- image.Destroy();
-
- if ( image.LoadFile( dir + _T("test.png") ) )
- my_square = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.png")) )
- wxLogError(wxT("Can't load PNG image"));
- else
- my_horse_png = wxBitmap( image );
-
- if ( !image.LoadFile( dir + _T("toucan.png")) )
- wxLogError(wxT("Can't load PNG image"));
- else
- my_toucan = wxBitmap(image);
-
- my_toucan_flipped_horiz = wxBitmap(image.Mirror(true));
- my_toucan_flipped_vert = wxBitmap(image.Mirror(false));
- my_toucan_flipped_both = wxBitmap(image.Mirror(true).Mirror(false));
- my_toucan_grey = wxBitmap(image.ConvertToGreyscale());
- my_toucan_head = wxBitmap(image.GetSubImage(wxRect(40, 7, 80, 60)));
- my_toucan_scaled_normal = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_NORMAL));
- my_toucan_scaled_high = wxBitmap(image.Scale(110,90,wxIMAGE_QUALITY_HIGH));
- my_toucan_blur = wxBitmap(image.Blur(10));
-
-#endif // wxUSE_LIBPNG
-
-#if wxUSE_LIBJPEG
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.jpg")) )
- wxLogError(wxT("Can't load JPG image"));
- else
- {
- my_horse_jpeg = wxBitmap( image );
-
- // Colorize by rotating green hue to red
- wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
- wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
- image.RotateHue(redHSV.hue - greenHSV.hue);
- colorized_horse_jpeg = wxBitmap( image );
- }
-
- if ( !image.LoadFile( dir + _T("cmyk.jpg")) )
- wxLogError(_T("Can't load CMYK JPG image"));
- else
- my_cmyk_jpeg = wxBitmap(image);
-#endif // wxUSE_LIBJPEG
-
-#if wxUSE_GIF
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.gif" )) )
- wxLogError(wxT("Can't load GIF image"));
- else
- my_horse_gif = wxBitmap( image );
-#endif
-
-#if wxUSE_PCX
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.pcx"), wxBITMAP_TYPE_PCX ) )
- wxLogError(wxT("Can't load PCX image"));
- else
- my_horse_pcx = wxBitmap( image );
-#endif
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.bmp"), wxBITMAP_TYPE_BMP ) )
- wxLogError(wxT("Can't load BMP image"));
- else
- my_horse_bmp = wxBitmap( image );
-
-#if wxUSE_XPM
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.xpm"), wxBITMAP_TYPE_XPM ) )
- wxLogError(wxT("Can't load XPM image"));
- else
- my_horse_xpm = wxBitmap( image );
-
- if ( !image.SaveFile( dir + _T("test.xpm"), wxBITMAP_TYPE_XPM ))
- wxLogError(wxT("Can't save file"));
-#endif
-
-#if wxUSE_PNM
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.pnm"), wxBITMAP_TYPE_PNM ) )
- wxLogError(wxT("Can't load PNM image"));
- else
- my_horse_pnm = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse_ag.pnm"), wxBITMAP_TYPE_PNM ) )
- wxLogError(wxT("Can't load PNM image"));
- else
- my_horse_asciigrey_pnm = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse_rg.pnm"), wxBITMAP_TYPE_PNM ) )
- wxLogError(wxT("Can't load PNM image"));
- else
- my_horse_rawgrey_pnm = wxBitmap( image );
-#endif
-
-#if wxUSE_LIBTIFF
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.tif"), wxBITMAP_TYPE_TIF ) )
- wxLogError(wxT("Can't load TIFF image"));
- else
- my_horse_tiff = wxBitmap( image );
-#endif
-
-#if wxUSE_LIBTIFF
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.tga"), wxBITMAP_TYPE_TGA ) )
- wxLogError(wxT("Can't load TGA image"));
- else
- my_horse_tga = wxBitmap( image );
-#endif
-
- CreateAntiAliasedBitmap();
-
- my_smile_xbm = wxBitmap( (const char*)smile_bits, smile_width,
- smile_height, 1 );
-
- // demonstrates XPM automatically using the mask when saving
- if ( m_bmpSmileXpm.Ok() )
- m_bmpSmileXpm.SaveFile(_T("saved.xpm"), wxBITMAP_TYPE_XPM);
-
-#if wxUSE_ICO_CUR
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 0 ) )
- wxLogError(wxT("Can't load first ICO image"));
- else
- my_horse_ico32 = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.ico"), wxBITMAP_TYPE_ICO, 1 ) )
- wxLogError(wxT("Can't load second ICO image"));
- else
- my_horse_ico16 = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.ico") ) )
- wxLogError(wxT("Can't load best ICO image"));
- else
- my_horse_ico = wxBitmap( image );
-
- image.Destroy();
-
- if ( !image.LoadFile( dir + _T("horse.cur"), wxBITMAP_TYPE_CUR ) )
- wxLogError(wxT("Can't load best ICO image"));
- else
- {
- my_horse_cur = wxBitmap( image );
- xH = 30 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X) ;
- yH = 2420 + image.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y) ;
- }
-
- m_ani_images = wxImage::GetImageCount ( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI );
- if (m_ani_images==0)
- wxLogError(wxT("No ANI-format images found"));
- else
- my_horse_ani = new wxBitmap [m_ani_images];
- int i ;
- for (i=0; i < m_ani_images; i++)
- {
- image.Destroy();
- if (!image.LoadFile( dir + _T("horse3.ani"), wxBITMAP_TYPE_ANI, i ))
- {
- wxString tmp = wxT("Can't load image number ");
- tmp << i ;
- wxLogError(tmp);
- }
- else
- my_horse_ani [i] = wxBitmap( image );
- }
-#endif // wxUSE_ICO_CUR
-
- image.Destroy();
-
- // test image loading from stream
- wxFile file(dir + _T("horse.bmp"));
- if ( file.IsOpened() )
- {
- wxFileOffset len = file.Length();
- size_t dataSize = (size_t)len;
- void *data = malloc(dataSize);
- if ( file.Read(data, dataSize) != len )
- wxLogError(_T("Reading bitmap file failed"));
- else
- {
- wxMemoryInputStream mis(data, dataSize);
- if ( !image.LoadFile(mis) )
- wxLogError(wxT("Can't load BMP image from stream"));
- else
- my_horse_bmp2 = wxBitmap( image );
- }
-
- free(data);
- }
-}
-
-MyCanvas::~MyCanvas()
-{
- delete [] my_horse_ani;
-}
-
-void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
-{
- wxPaintDC dc( this );
- PrepareDC( dc );
-
- dc.DrawText( _T("Loaded image"), 30, 10 );
- if (my_square.Ok())
- dc.DrawBitmap( my_square, 30, 30 );
-
- dc.DrawText( _T("Drawn directly"), 150, 10 );
- dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
- dc.SetPen( *wxBLACK_PEN );
- dc.DrawRectangle( 150, 30, 100, 100 );
- dc.SetBrush( *wxWHITE_BRUSH );
- dc.DrawRectangle( 170, 50, 60, 60 );
-
- if (my_anti.Ok())
- dc.DrawBitmap( my_anti, 280, 30 );
-
- dc.DrawText( _T("PNG handler"), 30, 135 );
- if (my_horse_png.Ok())
- {
- dc.DrawBitmap( my_horse_png, 30, 150 );
- wxRect rect(0,0,100,100);
- wxBitmap sub( my_horse_png.GetSubBitmap(rect) );
- dc.DrawText( _T("GetSubBitmap()"), 280, 175 );
- dc.DrawBitmap( sub, 280, 195 );
- }
-
- dc.DrawText( _T("JPEG handler"), 30, 365 );
- if (my_horse_jpeg.Ok())
- dc.DrawBitmap( my_horse_jpeg, 30, 380 );
-
- dc.DrawText( _T("Green rotated to red"), 280, 365 );
- if (colorized_horse_jpeg.Ok())
- dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );
-
- dc.DrawText( _T("CMYK JPEG image"), 530, 365 );
- if (my_cmyk_jpeg.Ok())
- dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );
-
- dc.DrawText( _T("GIF handler"), 30, 595 );
- if (my_horse_gif.Ok())
- dc.DrawBitmap( my_horse_gif, 30, 610 );
-
- dc.DrawText( _T("PCX handler"), 30, 825 );
- if (my_horse_pcx.Ok())
- dc.DrawBitmap( my_horse_pcx, 30, 840 );
-
- dc.DrawText( _T("BMP handler"), 30, 1055 );
- if (my_horse_bmp.Ok())
- dc.DrawBitmap( my_horse_bmp, 30, 1070 );
-
- dc.DrawText( _T("BMP read from memory"), 280, 1055 );
- if (my_horse_bmp2.Ok())
- dc.DrawBitmap( my_horse_bmp2, 280, 1070 );
-
- dc.DrawText( _T("PNM handler"), 30, 1285 );
- if (my_horse_pnm.Ok())
- dc.DrawBitmap( my_horse_pnm, 30, 1300 );
-
- dc.DrawText( _T("PNM handler (ascii grey)"), 280, 1285 );
- if (my_horse_asciigrey_pnm.Ok())
- dc.DrawBitmap( my_horse_asciigrey_pnm, 280, 1300 );
-
- dc.DrawText( _T("PNM handler (raw grey)"), 530, 1285 );
- if (my_horse_rawgrey_pnm.Ok())
- dc.DrawBitmap( my_horse_rawgrey_pnm, 530, 1300 );
-
- dc.DrawText( _T("TIFF handler"), 30, 1515 );
- if (my_horse_tiff.Ok())
- dc.DrawBitmap( my_horse_tiff, 30, 1530 );
-
- dc.DrawText( _T("TGA handler"), 30, 1745 );
- if (my_horse_tga.Ok())
- dc.DrawBitmap( my_horse_tga, 30, 1760 );
-
- dc.DrawText( _T("XPM handler"), 30, 1975 );
- if (my_horse_xpm.Ok())
- dc.DrawBitmap( my_horse_xpm, 30, 2000 );
-
- // toucans
- {
- int x = 750, y = 10, yy = 170;
-
- dc.DrawText(wxT("Original toucan"), x+50, y);
- dc.DrawBitmap(my_toucan, x, y+15, true);
- y += yy;
- dc.DrawText(wxT("Flipped horizontally"), x+50, y);
- dc.DrawBitmap(my_toucan_flipped_horiz, x, y+15, true);
- y += yy;
- dc.DrawText(wxT("Flipped vertically"), x+50, y);
- dc.DrawBitmap(my_toucan_flipped_vert, x, y+15, true);
- y += yy;
- dc.DrawText(wxT("Flipped both h&v"), x+50, y);
- dc.DrawBitmap(my_toucan_flipped_both, x, y+15, true);
-
- y += yy;
- dc.DrawText(wxT("In greyscale"), x+50, y);
- dc.DrawBitmap(my_toucan_grey, x, y+15, true);
-
- y += yy;
- dc.DrawText(wxT("Toucan's head"), x+50, y);
- dc.DrawBitmap(my_toucan_head, x, y+15, true);
-
- y += yy;
- dc.DrawText(wxT("Scaled with normal quality"), x+50, y);
- dc.DrawBitmap(my_toucan_scaled_normal, x, y+15, true);
-
- y += yy;
- dc.DrawText(wxT("Scaled with high quality"), x+50, y);
- dc.DrawBitmap(my_toucan_scaled_high, x, y+15, true);
-
- y += yy;
- dc.DrawText(wxT("Blured"), x+50, y);
- dc.DrawBitmap(my_toucan_blur, x, y+15, true);
- }
-
- if (my_smile_xbm.Ok())
- {
- int x = 300, y = 1800;
-
- dc.DrawText( _T("XBM bitmap"), x, y );
- dc.DrawText( _T("(green on red)"), x, y + 15 );
- dc.SetTextForeground( _T("GREEN") );
- dc.SetTextBackground( _T("RED") );
- dc.DrawBitmap( my_smile_xbm, x, y + 30 );
-
- dc.SetTextForeground( *wxBLACK );
- dc.DrawText( _T("After wxImage conversion"), x + 120, y );
- dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
- dc.SetTextForeground( wxT("RED") );
- wxImage i = my_smile_xbm.ConvertToImage();
- i.SetMaskColour( 255, 255, 255 );
- i.Replace( 0, 0, 0,
- wxRED_PEN->GetColour().Red(),
- wxRED_PEN->GetColour().Green(),
- wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
- dc.SetTextForeground( *wxBLACK );
- }
-
-
- wxBitmap mono( 60,50,1 );
- wxMemoryDC memdc;
- memdc.SelectObject( mono );
- memdc.SetPen( *wxBLACK_PEN );
- memdc.SetBrush( *wxWHITE_BRUSH );
- memdc.DrawRectangle( 0,0,60,50 );
- memdc.SetTextForeground( *wxBLACK );
-#ifndef __WXGTK20__
- // I cannot convince GTK2 to draw into mono bitmaps
- memdc.DrawText( _T("Hi!"), 5, 5 );
-#endif
- memdc.SetBrush( *wxBLACK_BRUSH );
- memdc.DrawRectangle( 33,5,20,20 );
- memdc.SetPen( *wxRED_PEN );
- memdc.DrawLine( 5, 42, 50, 42 );
- memdc.SelectObject( wxNullBitmap );
-
- if (mono.Ok())
- {
- int x = 300, y = 1900;
-
- dc.DrawText( _T("Mono bitmap"), x, y );
- dc.DrawText( _T("(red on green)"), x, y + 15 );
- dc.SetTextForeground( wxT("RED") );
- dc.SetTextBackground( wxT("GREEN") );
- dc.DrawBitmap( mono, x, y + 30 );
-
- dc.SetTextForeground( *wxBLACK );
- dc.DrawText( _T("After wxImage conversion"), x + 120, y );
- dc.DrawText( _T("(red on white)"), x + 120, y + 15 );
- dc.SetTextForeground( wxT("RED") );
- wxImage i = mono.ConvertToImage();
- i.SetMaskColour( 255,255,255 );
- i.Replace( 0,0,0,
- wxRED_PEN->GetColour().Red(),
- wxRED_PEN->GetColour().Green(),
- wxRED_PEN->GetColour().Blue() );
- dc.DrawBitmap( wxBitmap(i), x + 120, y + 30, true );
- dc.SetTextForeground( *wxBLACK );
- }
-
- // For testing transparency
- dc.SetBrush( *wxRED_BRUSH );
- dc.DrawRectangle( 20, 2220, 560, 68 );
-
- dc.DrawText(_T("XPM bitmap"), 30, 2230 );
- if ( m_bmpSmileXpm.Ok() )
- dc.DrawBitmap(m_bmpSmileXpm, 30, 2250, true);
-
- dc.DrawText(_T("XPM icon"), 110, 2230 );
- if ( m_iconSmileXpm.Ok() )
- dc.DrawIcon(m_iconSmileXpm, 110, 2250);
-
- // testing icon -> bitmap conversion
- wxBitmap to_blit( m_iconSmileXpm );
- if (to_blit.Ok())
- {
- dc.DrawText( _T("SubBitmap"), 170, 2230 );
- wxBitmap sub = to_blit.GetSubBitmap( wxRect(0,0,15,15) );
- if (sub.Ok())
- dc.DrawBitmap( sub, 170, 2250, true );
-
- dc.DrawText( _T("Enlarged"), 250, 2230 );
- dc.SetUserScale( 1.5, 1.5 );
- dc.DrawBitmap( to_blit, (int)(250/1.5), (int)(2250/1.5), true );
- dc.SetUserScale( 2, 2 );
- dc.DrawBitmap( to_blit, (int)(300/2), (int)(2250/2), true );
- dc.SetUserScale( 1.0, 1.0 );
-
- dc.DrawText( _T("Blit"), 400, 2230);
- wxMemoryDC blit_dc;
- blit_dc.SelectObject( to_blit );
- dc.Blit( 400, 2250, to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
- dc.SetUserScale( 1.5, 1.5 );
- dc.Blit( (int)(450/1.5), (int)(2250/1.5), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
- dc.SetUserScale( 2, 2 );
- dc.Blit( (int)(500/2), (int)(2250/2), to_blit.GetWidth(), to_blit.GetHeight(), &blit_dc, 0, 0, wxCOPY, true );
- dc.SetUserScale( 1.0, 1.0 );
- }
-
- dc.DrawText( _T("ICO handler (1st image)"), 30, 2290 );
- if (my_horse_ico32.Ok())
- dc.DrawBitmap( my_horse_ico32, 30, 2330, true );
-
- dc.DrawText( _T("ICO handler (2nd image)"), 230, 2290 );
- if (my_horse_ico16.Ok())
- dc.DrawBitmap( my_horse_ico16, 230, 2330, true );
-
- dc.DrawText( _T("ICO handler (best image)"), 430, 2290 );
- if (my_horse_ico.Ok())
- dc.DrawBitmap( my_horse_ico, 430, 2330, true );
-
- dc.DrawText( _T("CUR handler"), 30, 2390 );
- if (my_horse_cur.Ok())
- {
- dc.DrawBitmap( my_horse_cur, 30, 2420, true );
- dc.SetPen (*wxRED_PEN);
- dc.DrawLine (xH-10,yH,xH+10,yH);
- dc.DrawLine (xH,yH-10,xH,yH+10);
- }
-
- dc.DrawText( _T("ANI handler"), 230, 2390 );
- for ( int i=0; i < m_ani_images; i++ )
- {
- if (my_horse_ani[i].Ok())
- {
- dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
- }
- }
-}
-
-void MyCanvas::CreateAntiAliasedBitmap()
-{
- wxBitmap bitmap( 300, 300 );
-
- wxMemoryDC dc;
-
- dc.SelectObject( bitmap );
-
- dc.Clear();
-
- dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL) );
- dc.SetTextForeground( wxT("RED") );
- dc.DrawText( _T("This is anti-aliased Text."), 20, 5 );
- dc.DrawText( _T("And a Rectangle."), 20, 45 );
-
- dc.SetBrush( *wxRED_BRUSH );
- dc.SetPen( *wxTRANSPARENT_PEN );
- dc.DrawRoundedRectangle( 20, 85, 200, 180, 20 );
-
- wxImage original= bitmap.ConvertToImage();
- wxImage anti( 150, 150 );
-
- /* This is quite slow, but safe. Use wxImage::GetData() for speed instead. */
-
- for (int y = 1; y < 149; y++)
- for (int x = 1; x < 149; x++)
- {
- int red = original.GetRed( x*2, y*2 ) +
- original.GetRed( x*2-1, y*2 ) +
- original.GetRed( x*2, y*2+1 ) +
- original.GetRed( x*2+1, y*2+1 );
- red = red/4;
-
- int green = original.GetGreen( x*2, y*2 ) +
- original.GetGreen( x*2-1, y*2 ) +
- original.GetGreen( x*2, y*2+1 ) +
- original.GetGreen( x*2+1, y*2+1 );
- green = green/4;
-
- int blue = original.GetBlue( x*2, y*2 ) +
- original.GetBlue( x*2-1, y*2 ) +
- original.GetBlue( x*2, y*2+1 ) +
- original.GetBlue( x*2+1, y*2+1 );
- blue = blue/4;
- anti.SetRGB( x, y, (unsigned char)red, (unsigned char)green, (unsigned char)blue );
- }
- my_anti = wxBitmap(anti);
-}
-
-// BM_TO_CMP_FRAME
-
-enum
-{
- ID_QUIT = wxID_EXIT,
- ID_ABOUT = wxID_ABOUT,
- ID_NEW = 100,
- ID_SHOWRAW = 101
-};
-
-IMPLEMENT_DYNAMIC_CLASS( BM_TO_CMP_FRAME, wxFrame )
-
-BEGIN_EVENT_TABLE(BM_TO_CMP_FRAME,wxFrame)
- EVT_MENU (ID_ABOUT, BM_TO_CMP_FRAME::OnAbout)
- EVT_MENU (ID_QUIT, BM_TO_CMP_FRAME::OnQuit)
- EVT_MENU (ID_NEW, BM_TO_CMP_FRAME::OnNewFrame)
-#ifdef wxHAVE_RAW_BITMAP
- EVT_MENU (ID_SHOWRAW, BM_TO_CMP_FRAME::OnTestRawBitmap)
-#endif
-
-#if wxUSE_CLIPBOARD
- EVT_MENU(wxID_COPY, BM_TO_CMP_FRAME::OnCopy)
- EVT_MENU(wxID_PASTE, BM_TO_CMP_FRAME::OnPaste)
-#endif // wxUSE_CLIPBOARD
-END_EVENT_TABLE()
-
-BM_TO_CMP_FRAME::BM_TO_CMP_FRAME()
- : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
- wxPoint(20, 20), wxSize(950, 700) )
-{
- wxMenuBar *menu_bar = new wxMenuBar();
-
- wxMenu *menuImage = new wxMenu;
- menuImage->Append( ID_NEW, _T("&Show any image...\tCtrl-O"));
-
-#ifdef wxHAVE_RAW_BITMAP
- menuImage->Append( ID_SHOWRAW, _T("Test &raw bitmap...\tCtrl-R"));
-#endif
- menuImage->AppendSeparator();
- menuImage->Append( ID_ABOUT, _T("&About..."));
- menuImage->AppendSeparator();
- menuImage->Append( ID_QUIT, _T("E&xit\tCtrl-Q"));
- menu_bar->Append(menuImage, _T("&Image"));
-
-#if wxUSE_CLIPBOARD
- wxMenu *menuClipboard = new wxMenu;
- menuClipboard->Append(wxID_COPY, _T("&Copy test image\tCtrl-C"));
- menuClipboard->Append(wxID_PASTE, _T("&Paste image\tCtrl-V"));
- menu_bar->Append(menuClipboard, _T("&Clipboard"));
-#endif // wxUSE_CLIPBOARD
-
- SetMenuBar( menu_bar );
-
-#if wxUSE_STATUSBAR
- CreateStatusBar(2);
- int widths[] = { -1, 100 };
- SetStatusWidths( 2, widths );
-#endif // wxUSE_STATUSBAR
-
- m_canvas = new MyCanvas( this, wxID_ANY, wxPoint(0,0), wxSize(10,10) );
-
- // 500 width * 2750 height
- m_canvas->SetScrollbars( 10, 10, 50, 275 );
-}
-
-void BM_TO_CMP_FRAME::OnQuit( wxCommandEvent &WXUNUSED(event) )
-{
- Close( true );
-}
-
-void BM_TO_CMP_FRAME::OnAbout( wxCommandEvent &WXUNUSED(event) )
-{
- (void)wxMessageBox( _T("wxImage demo\n")
- _T("Robert Roebling (c) 1998,2000"),
- _T("About wxImage Demo"), wxICON_INFORMATION | wxOK );
-}
-
-void BM_TO_CMP_FRAME::OnNewFrame( wxCommandEvent &WXUNUSED(event) )
-{
-#if wxUSE_FILEDLG
- wxString filename = wxFileSelector(_T("Select image file"));
- if ( !filename )
- return;
-
- wxImage image;
- if ( !image.LoadFile(filename) )
- {
- wxLogError(_T("Couldn't load image from '%s'."), filename.c_str());
-
- return;
- }
-
- (new MyImageFrame(this, wxBitmap(image)))->Show();
-#endif // wxUSE_FILEDLG
-}
-
-#ifdef wxHAVE_RAW_BITMAP
-
-void BM_TO_CMP_FRAME::OnTestRawBitmap( wxCommandEvent &WXUNUSED(event) )
-{
- (new MyRawBitmapFrame(this))->Show();
-}
-
-#endif // wxHAVE_RAW_BITMAP
-
-#if wxUSE_CLIPBOARD
-
-void BM_TO_CMP_FRAME::OnCopy(wxCommandEvent& WXUNUSED(event))
-{
- wxBitmapDataObject *dobjBmp = new wxBitmapDataObject;
- dobjBmp->SetBitmap(m_canvas->my_horse_png);
-
- wxTheClipboard->Open();
-
- if ( !wxTheClipboard->SetData(dobjBmp) )
- {
- wxLogError(_T("Failed to copy bitmap to clipboard"));
- }
-
- wxTheClipboard->Close();
-}
-
-void BM_TO_CMP_FRAME::OnPaste(wxCommandEvent& WXUNUSED(event))
-{
- wxBitmapDataObject dobjBmp;
-
- wxTheClipboard->Open();
- if ( !wxTheClipboard->GetData(dobjBmp) )
- {
- wxLogMessage(_T("No bitmap data in the clipboard"));
- }
- else
- {
- (new MyImageFrame(this, dobjBmp.GetBitmap()))->Show();
- }
- wxTheClipboard->Close();
-}
-
-#endif // wxUSE_CLIPBOARD
-
-//-----------------------------------------------------------------------------
-// BM_TO_CMP_APP
-//-----------------------------------------------------------------------------
-
-bool BM_TO_CMP_APP::OnInit()
-{
- wxInitAllImageHandlers();
-
- wxFrame *frame = new BM_TO_CMP_FRAME();
- frame->Show( true );
-
- return true;
-}
diff --git a/eeschema/build_BOM.cpp b/eeschema/build_BOM.cpp
index 8d1a5854df..8ae9417846 100644
--- a/eeschema/build_BOM.cpp
+++ b/eeschema/build_BOM.cpp
@@ -797,6 +797,10 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
// Store fields. Store non empty fields only.
for( int jj = FOOTPRINT; jj < currCmp->GetFieldCount(); jj++ )
{
+ //Ensure fields exists in dummy component
+ if( dummyCmp.GetFieldCount() < currCmp->GetFieldCount() )
+ dummyCmp.AddField( *currCmp->GetField( jj ) );
+ // store useful data
if( !currCmp->GetField( jj )->m_Text.IsEmpty() )
dummyCmp.GetField( jj )->m_Text = currCmp->GetField( jj )->m_Text;
}
@@ -848,6 +852,8 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
// print fields, on demand
for( int jj = FIELD1; jj <= FIELD8 ; jj++ )
{
+ if( dummyCmp.GetFieldCount() >= jj )
+ break;
if ( IsFieldChecked( jj ) )
fprintf( f, "%c%4s", s_ExportSeparatorSymbol,
CONV_TO_UTF8( dummyCmp.GetField( jj )->m_Text ) );
diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index eb92b29d79..02e9958c1a 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -194,7 +194,7 @@ bool WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsN
GetChars( fn.GetFullPath() ),
GetChars( errMsg ) );
DisplayError( this, prompt );
- msg += wxT( " ->Error" );
+ msg += _( " ->Error" );
}
PrintMsg( msg );
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index bad890292a..0a06698ec0 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -62,7 +62,7 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
else
{
wxString msg;
- msg.Printf( _( "GerbView only supports a maximum of %d layers. You must first \
+ msg.Printf( _( "GerbView only supports a maximum of %d layers. You must first \
delete an existing layer to load any new layers." ), NB_LAYERS );
wxMessageBox( msg );
}
diff --git a/pcbnew/automove.cpp b/pcbnew/automove.cpp
index 7a980bf82d..790f27b196 100644
--- a/pcbnew/automove.cpp
+++ b/pcbnew/automove.cpp
@@ -204,8 +204,7 @@ void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
if( PlaceModulesHorsPcb && !EdgeExists )
{
DisplayError( this,
- _( "Could not automatically place modules. No board \
-edges detected." ) );
+ _( "Could not automatically place modules. No board outlines detected." ) );
return;
}
diff --git a/pcbnew/dialog_gendrill_base.cpp b/pcbnew/dialog_gendrill_base.cpp
index 0b9daf1b0d..bdf3678282 100644
--- a/pcbnew/dialog_gendrill_base.cpp
+++ b/pcbnew/dialog_gendrill_base.cpp
@@ -58,7 +58,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );
m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );
m_Choice_Drill_Map->SetSelection( 0 );
- m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PSr HPGL or others formats") );
+ m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PS, HPGL or others formats") );
bMiddleBoxSizer->Add( m_Choice_Drill_Map, 0, wxALL|wxEXPAND, 5 );
diff --git a/pcbnew/dialog_gendrill_base.fbp b/pcbnew/dialog_gendrill_base.fbp
index dee44347e4..b291a58cb8 100644
--- a/pcbnew/dialog_gendrill_base.fbp
+++ b/pcbnew/dialog_gendrill_base.fbp
@@ -335,7 +335,7 @@
wxRA_SPECIFY_COLS
- Creates a drill map in PSr HPGL or others formats
+ Creates a drill map in PS, HPGL or others formats