From 0e4cd590cf8c074b05cce99438b304ea86d884aa Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Wed, 19 Jun 2019 16:23:00 +0200 Subject: [PATCH] Fixes in bitmap2cmp: enhancements and fixes. * Cleaning code * When changing the units, the displayed sizes are converted to the new value. * Fix incorrect changes when the aspect ration is fixed, in DPI units. --- bitmap2component/bitmap2cmp_gui.cpp | 372 +++++++++++++++++++--------- bitmap2component/bitmap2cmp_gui.h | 67 +++-- 2 files changed, 306 insertions(+), 133 deletions(-) diff --git a/bitmap2component/bitmap2cmp_gui.cpp b/bitmap2component/bitmap2cmp_gui.cpp index 81c03a003e..77560d19ac 100644 --- a/bitmap2component/bitmap2cmp_gui.cpp +++ b/bitmap2component/bitmap2cmp_gui.cpp @@ -52,67 +52,169 @@ #define KEYWORD_LAST_MODLAYER wxT( "Last_modlayer" ) #define KEYWORD_BINARY_THRESHOLD wxT( "Threshold" ) #define KEYWORD_BW_NEGATIVE wxT( "Negative_choice" ) +#define KEYWORD_UNIT_SELECTION wxT( "Unit_selection" ) -//Default value and unit for input -#define DEFAULT_SIZE_VALUE 10 -#define DEFAULT_SIZE_UNIT MM +#define DEFAULT_DPI 300 // the image DPI used in formats that do not define a DPI IMAGE_SIZE::IMAGE_SIZE() { - m_value = 0; - m_value = MM; + m_outputSize = 0.0; + m_originalDPI = DEFAULT_DPI; + m_originalSizePixels = 0; + m_unit = MILLIMETRES; } -void IMAGE_SIZE::Set( float aValue, UNIT aUnit ) + +void IMAGE_SIZE::SetOutputSizeFromInitialImageSize() { - m_value = aValue; - m_unit = aUnit; + // Set the m_outputSize value from the m_originalSizePixels and the selected unit + if( m_unit == MILLIMETRES ) + { + m_outputSize = (double)GetOriginalSizePixels() / m_originalDPI * 25.4; + } + else if( m_unit == INCHES ) + { + m_outputSize = (double)GetOriginalSizePixels() / m_originalDPI; + } + else + { + m_outputSize = m_originalDPI; + } + } -void IMAGE_SIZE::SetInputResolution( int aResolution ) -{ - m_originalResolution = aResolution; -} - - -float IMAGE_SIZE::GetValue() -{ - return m_value; -} int IMAGE_SIZE::GetOutputDPI() { int outputDPI; - if( m_unit == MM ) - { - outputDPI = m_originalResolution / ( m_value / 25.4 ); - } - else if( m_unit == INCH ) + if( m_unit == MILLIMETRES ) { - outputDPI = m_originalResolution / ( m_value ); + outputDPI = GetOriginalSizePixels() / ( m_outputSize / 25.4 ); } - - else if( m_unit == MILS ) + else if( m_unit == INCHES ) { - outputDPI = m_originalResolution / ( m_value / 1000 ); + outputDPI = GetOriginalSizePixels() / m_outputSize; } - else { - outputDPI = m_value; + outputDPI = KiROUND( m_outputSize ); } + return outputDPI; } +void IMAGE_SIZE::SetUnit( EDA_UNITS_T aUnit ) +{ + // Set the unit used for m_outputSize, and convert the old m_outputSize value + // to the value in new unit + if( aUnit == m_unit ) + return; + + // Convert m_outputSize to mm: + double size_mm; + + if( m_unit == MILLIMETRES ) + { + size_mm = m_outputSize; + } + else if( m_unit == INCHES ) + { + size_mm = m_outputSize * 25.4; + } + else + { + // m_outputSize is the DPI, not an image size + // the image size is m_originalSizePixels / m_outputSize (in inches) + if( m_outputSize ) + size_mm = m_originalSizePixels / m_outputSize * 25.4; + else + size_mm = 0; + } + + // Convert m_outputSize to new value: + if( aUnit == MILLIMETRES ) + { + m_outputSize = size_mm; + } + else if( aUnit == INCHES ) + { + m_outputSize = size_mm / 25.4; + } + else + { + if( size_mm ) + m_outputSize = m_originalSizePixels / size_mm * 25.4; + else + m_outputSize = 0; + } + + m_unit = aUnit; +} + + + BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) : BM2CMP_FRAME_BASE( aParent ) { SetKiway( this, aKiway ); - - int tmp; m_config = GetNewConfig( Pgm().App().GetAppName() ); + + wxString unitList[] = + { + _("mm"), _("Inch"), _("DPI") + }; + + for( int ii = 0; ii < 3; ii++ ) + m_PixelUnit->Append( unitList[ii] ); + + LoadSettings(); + + m_outputSizeX.SetUnit( getUnitFromSelection() ); + m_outputSizeY.SetUnit( getUnitFromSelection() ); + m_outputSizeX.SetOutputSize( 0, getUnitFromSelection() ); + m_outputSizeY.SetOutputSize( 0, getUnitFromSelection() ); + + m_UnitSizeX->ChangeValue( FormatOutputSize( m_outputSizeX.GetOutputSize() ) ); + m_UnitSizeY->ChangeValue( FormatOutputSize( m_outputSizeY.GetOutputSize() ) ); + + //Set icon for aspect ratio + m_AspectRatioLocked = true; + m_AspectRatio = 1; + m_AspectRatioLockButton->SetBitmap( KiBitmap( locked_xpm ) ); + + // Give an icon + wxIcon icon; + icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) ); + SetIcon( icon ); + + GetSizer()->SetSizeHints( this ); + + SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); + + m_buttonExportFile->Enable( false ); + m_buttonExportClipboard->Enable( false ); + + + if ( m_framePos == wxDefaultPosition ) + Centre(); +} + + +BM2CMP_FRAME::~BM2CMP_FRAME() +{ + SaveSettings(); + /* This needed for OSX: avoids further OnDraw processing after this + * destructor and before the native window is destroyed + */ + this->Freeze( ); +} + + +void BM2CMP_FRAME::LoadSettings() +{ + int tmp; m_config->Read( KEYWORD_FRAME_POSX, & m_framePos.x, -1 ); m_config->Read( KEYWORD_FRAME_POSY, & m_framePos.y, -1 ); m_config->Read( KEYWORD_FRAME_SIZEX, & m_frameSize.x, -1 ); @@ -120,6 +222,14 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_config->Read( KEYWORD_LAST_INPUT_FILE, &m_BitmapFileName ); m_config->Read( KEYWORD_LAST_OUTPUT_FILE, &m_ConvertedFileName ); + int u_select = 0; + m_config->Read( KEYWORD_UNIT_SELECTION, &u_select, 0 ); + + if( u_select < 0 || u_select > 2 ) // Validity control + u_select = 0; + + m_PixelUnit->SetSelection( u_select ); + if( m_config->Read( KEYWORD_BINARY_THRESHOLD, &tmp ) ) m_sliderThreshold->SetValue( tmp ); @@ -149,65 +259,32 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) : else m_radio_PCBLayer->SetSelection( tmp ); } - - for( auto const& it : m_unitMap ) - { - m_PixelUnit->Append( it.second ); - } - m_PixelUnit->SetSelection( DEFAULT_SIZE_UNIT ); - - m_UnitSizeX->ChangeValue( wxString::Format( wxT( "%d" ), DEFAULT_SIZE_VALUE ) ); - m_UnitSizeY->ChangeValue( wxString::Format( wxT( "%d" ), DEFAULT_SIZE_VALUE ) ); - - m_outputSizeX.Set( DEFAULT_SIZE_VALUE, UNIT::DEFAULT_SIZE_UNIT ); - m_outputSizeY.Set( DEFAULT_SIZE_VALUE, UNIT::DEFAULT_SIZE_UNIT ); - - //Set icon for aspect ratio - m_AspectRatioLocked = true; - m_AspectRatio = 1; - m_AspectRatioLockButton->SetBitmap( KiBitmap( locked_xpm ) ); - - // Give an icon - wxIcon icon; - icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) ); - SetIcon( icon ); - - GetSizer()->SetSizeHints( this ); - - SetSize( m_framePos.x, m_framePos.y, m_frameSize.x, m_frameSize.y ); - - m_buttonExportFile->Enable( false ); - m_buttonExportClipboard->Enable( false ); - - - if ( m_framePos == wxDefaultPosition ) - Centre(); } -BM2CMP_FRAME::~BM2CMP_FRAME() +void BM2CMP_FRAME::SaveSettings() { - if( !m_config || IsIconized() ) + if( !m_config ) return; m_frameSize = GetSize(); m_framePos = GetPosition(); - m_config->Write( KEYWORD_FRAME_POSX, (long) m_framePos.x ); - m_config->Write( KEYWORD_FRAME_POSY, (long) m_framePos.y ); - m_config->Write( KEYWORD_FRAME_SIZEX, (long) m_frameSize.x ); - m_config->Write( KEYWORD_FRAME_SIZEY, (long) m_frameSize.y ); + if( !IsIconized() ) + { + m_config->Write( KEYWORD_FRAME_POSX, (long) m_framePos.x ); + m_config->Write( KEYWORD_FRAME_POSY, (long) m_framePos.y ); + m_config->Write( KEYWORD_FRAME_SIZEX, (long) m_frameSize.x ); + m_config->Write( KEYWORD_FRAME_SIZEY, (long) m_frameSize.y ); + } + m_config->Write( KEYWORD_LAST_INPUT_FILE, m_BitmapFileName ); m_config->Write( KEYWORD_LAST_OUTPUT_FILE, m_ConvertedFileName ); m_config->Write( KEYWORD_BINARY_THRESHOLD, m_sliderThreshold->GetValue() ); m_config->Write( KEYWORD_BW_NEGATIVE, m_checkNegative->IsChecked() ? 1 : 0 ); m_config->Write( KEYWORD_LAST_FORMAT, m_radioBoxFormat->GetSelection() ); m_config->Write( KEYWORD_LAST_MODLAYER, m_radio_PCBLayer->GetSelection() ); - - /* This needed for OSX: avoids further OnDraw processing after this - * destructor and before the native window is destroyed - */ - this->Freeze( ); + m_config->Write( KEYWORD_UNIT_SELECTION, m_PixelUnit->GetSelection() ); } @@ -309,13 +386,6 @@ bool BM2CMP_FRAME::OpenProjectFiles( const std::vector& aFileSet, int m_Pict_Bitmap = wxBitmap( m_Pict_Image ); - int h = m_Pict_Bitmap.GetHeight(); - int w = m_Pict_Bitmap.GetWidth(); - - m_outputSizeX.SetInputResolution( w ); - m_outputSizeY.SetInputResolution( h ); - m_AspectRatio = (float) w / (float) h; - // Determine image resolution in DPI (does not existing in all formats). // the resolution can be given in bit per inches or bit per cm in file @@ -326,23 +396,28 @@ bool BM2CMP_FRAME::OpenProjectFiles( const std::vector& aFileSet, int { if( m_Pict_Image.GetOptionInt( wxIMAGE_OPTION_RESOLUTIONUNIT ) == wxIMAGE_RESOLUTION_CM ) { - // When the initial resolution is given in bits per cm, - // experience shows adding 1.27 to the resolution converted in dpi - // before convert to int value reduce the conversion error - // but it is not perfect - imageDPIx = imageDPIx * 2.54 + 1.27; - imageDPIy = imageDPIy * 2.54 + 1.27; + imageDPIx = KiROUND( imageDPIx * 2.54 ); + imageDPIy = KiROUND( imageDPIy * 2.54 ); } } - else // fallback to the default value + else // fallback to a default value (DEFAULT_DPI) { - imageDPIx = imageDPIy = 0; + imageDPIx = imageDPIy = DEFAULT_DPI; } m_InputXValueDPI->SetLabel( wxString::Format( wxT( "%d" ), imageDPIx ) ); m_InputYValueDPI->SetLabel( wxString::Format( wxT( "%d" ), imageDPIy ) ); - //Update display to keep aspectratio + int h = m_Pict_Bitmap.GetHeight(); + int w = m_Pict_Bitmap.GetWidth(); + m_AspectRatio = (double) w / h; + + m_outputSizeX.SetOriginalDPI( imageDPIx ); + m_outputSizeX.SetOriginalSizePixels( w ); + m_outputSizeY.SetOriginalDPI( imageDPIy ); + m_outputSizeY.SetOriginalSizePixels( h ); + + // Update display to keep aspect ratio auto fakeEvent = wxCommandEvent(); OnSizeChangeX( fakeEvent ); @@ -381,10 +456,36 @@ bool BM2CMP_FRAME::OpenProjectFiles( const std::vector& aFileSet, int m_buttonExportFile->Enable( true ); m_buttonExportClipboard->Enable( true ); + m_outputSizeX.SetOutputSizeFromInitialImageSize(); + m_UnitSizeX->ChangeValue( FormatOutputSize( m_outputSizeX.GetOutputSize() ) ); + m_outputSizeY.SetOutputSizeFromInitialImageSize(); + m_UnitSizeY->ChangeValue( FormatOutputSize( m_outputSizeY.GetOutputSize() ) ); + return true; } +// return a string giving the output size, according to the selected unit +wxString BM2CMP_FRAME::FormatOutputSize( double aSize ) +{ + wxString text; + + if( getUnitFromSelection() == MILLIMETRES ) + { + text.Printf( "%.1f", aSize ); + } + else if( getUnitFromSelection() == INCHES ) + { + text.Printf( "%.2f", aSize ); + } + else + { + text.Printf( "%d", KiROUND( aSize ) ); + } + + return text; +} + void BM2CMP_FRAME::updateImageInfo() { // Note: the image resolution text controls are not modified @@ -404,47 +505,95 @@ void BM2CMP_FRAME::updateImageInfo() } +EDA_UNITS_T BM2CMP_FRAME::getUnitFromSelection() +{ + // return the EDA_UNITS_T from the m_PixelUnit choice + switch( m_PixelUnit->GetSelection() ) + { + case 1: + return INCHES; + + case 2: + return UNSCALED_UNITS; + + case 0: + default: + break; + } + + return MILLIMETRES; +} + + void BM2CMP_FRAME::OnSizeChangeX( wxCommandEvent& event ) { - double setSize; - if( m_UnitSizeX->GetValue().ToDouble( &setSize ) ) - { - m_outputSizeX.Set( setSize, (UNIT) m_PixelUnit->GetSelection() ); + double new_size; + if( m_UnitSizeX->GetValue().ToDouble( &new_size ) ) + { if( m_AspectRatioLocked ) { - double calculatedY = setSize / m_AspectRatio; - m_UnitSizeY->ChangeValue( wxString::Format( wxT( "%.2f" ), calculatedY ) ); - m_outputSizeY.Set( calculatedY, (UNIT) m_PixelUnit->GetSelection() ); + double calculatedY = new_size / m_AspectRatio; + + if( getUnitFromSelection() == UNSCALED_UNITS ) + { + // for units in DPI, keeping aspect ratio cannot use m_AspectRatioLocked. + // just rescale the other dpi + double ratio = new_size / m_outputSizeX.GetOutputSize(); + calculatedY = m_outputSizeY.GetOutputSize() * ratio; + } + + m_outputSizeY.SetOutputSize( calculatedY, getUnitFromSelection() ); + m_UnitSizeY->ChangeValue( FormatOutputSize( m_outputSizeY.GetOutputSize() ) ); } + + m_outputSizeX.SetOutputSize( new_size, getUnitFromSelection() ); } + updateImageInfo(); } + void BM2CMP_FRAME::OnSizeChangeY( wxCommandEvent& event ) { - double setSize; + double new_size; - if( m_UnitSizeY->GetValue().ToDouble( &setSize ) ) + if( m_UnitSizeY->GetValue().ToDouble( &new_size ) ) { - m_outputSizeY.Set( setSize, (UNIT) m_PixelUnit->GetSelection() ); if( m_AspectRatioLocked ) { - double calculatedX = setSize * m_AspectRatio; - m_UnitSizeX->ChangeValue( wxString::Format( wxT( "%.2f" ), calculatedX ) ); - m_outputSizeX.Set( calculatedX, (UNIT) m_PixelUnit->GetSelection() ); + double calculatedX = new_size * m_AspectRatio; + + if( getUnitFromSelection() == UNSCALED_UNITS ) + { + // for units in DPI, keeping aspect ratio cannot use m_AspectRatioLocked. + // just rescale the other dpi + double ratio = new_size / m_outputSizeX.GetOutputSize(); + calculatedX = m_outputSizeX.GetOutputSize() * ratio; + } + + m_outputSizeX.SetOutputSize( calculatedX, getUnitFromSelection() ); + m_UnitSizeX->ChangeValue( FormatOutputSize( m_outputSizeX.GetOutputSize() ) ); } + + m_outputSizeY.SetOutputSize( new_size, getUnitFromSelection() ); } + updateImageInfo(); } + void BM2CMP_FRAME::OnSizeUnitChange( wxCommandEvent& event ) { - m_outputSizeX.SetUnit( (UNIT) m_PixelUnit->GetSelection() ); - m_outputSizeY.SetUnit( (UNIT) m_PixelUnit->GetSelection() ); + m_outputSizeX.SetUnit( getUnitFromSelection() ); + m_outputSizeY.SetUnit( getUnitFromSelection() ); updateImageInfo(); + + m_UnitSizeX->ChangeValue( FormatOutputSize( m_outputSizeX.GetOutputSize() ) ); + m_UnitSizeY->ChangeValue( FormatOutputSize( m_outputSizeY.GetOutputSize() ) ); } + void BM2CMP_FRAME::ToggleAspectRatioLock( wxCommandEvent& event ) { m_AspectRatioLocked = !m_AspectRatioLocked; @@ -452,7 +601,7 @@ void BM2CMP_FRAME::ToggleAspectRatioLock( wxCommandEvent& event ) if( m_AspectRatioLocked ) { m_AspectRatioLockButton->SetBitmap( KiBitmap( locked_xpm ) ); - //Force resolution update when aspect ratio is locked + //Force display update when aspect ratio is locked auto fakeEvent = wxCommandEvent(); OnSizeChangeX( fakeEvent ); } @@ -463,6 +612,7 @@ void BM2CMP_FRAME::ToggleAspectRatioLock( wxCommandEvent& event ) } } + void BM2CMP_FRAME::Binarize( double aThreshold ) { int h = m_Greyscale_Image.GetHeight(); @@ -612,7 +762,7 @@ void BM2CMP_FRAME::OnExportLogo() if( outfile == NULL ) { wxString msg; - msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) ); + msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName ); wxMessageBox( msg ); return; } @@ -652,7 +802,7 @@ void BM2CMP_FRAME::exportPostScriptFormat() if( outfile == NULL ) { wxString msg; - msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) ); + msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName ); wxMessageBox( msg ); return; } @@ -691,7 +841,7 @@ void BM2CMP_FRAME::exportEeschemaFormat() if( outfile == NULL ) { wxString msg; - msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) ); + msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName ); wxMessageBox( msg ); return; } @@ -730,7 +880,7 @@ void BM2CMP_FRAME::exportPcbnewFormat() if( outfile == NULL ) { wxString msg; - msg.Printf( _( "File \"%s\" could not be created." ), GetChars( m_ConvertedFileName ) ); + msg.Printf( _( "File \"%s\" could not be created." ), m_ConvertedFileName ); wxMessageBox( msg ); return; } diff --git a/bitmap2component/bitmap2cmp_gui.h b/bitmap2component/bitmap2cmp_gui.h index 3959cb1fe7..db00d31e1d 100644 --- a/bitmap2component/bitmap2cmp_gui.h +++ b/bitmap2component/bitmap2cmp_gui.h @@ -26,44 +26,60 @@ #include "bitmap2component.h" #include "bitmap2cmp_gui_base.h" -#include #include +#include // for EDA_UNITS_T -enum UNIT -{ - MM = 0, - INCH, - MILS, - DPI -}; class IMAGE_SIZE { public: IMAGE_SIZE(); - void Set( float aValue, UNIT aUnit ); - void SetUnit( UNIT aUnit ) + // Set the unit used for m_outputSize, and convert the old m_outputSize value + // to the value in new unit + void SetUnit( EDA_UNITS_T aUnit ); + + // Accessors: + void SetOriginalDPI( int aDPI ) + { + m_originalDPI = aDPI; + } + + void SetOriginalSizePixels( int aPixels ) + { + m_originalSizePixels = aPixels; + } + + double GetOutputSize() + { + return m_outputSize; + } + + void SetOutputSize( double aSize, EDA_UNITS_T aUnit ) { m_unit = aUnit; + m_outputSize = aSize; } - - void SetInputResolution( int aResolution ); - int GetInputResolution() + int GetOriginalSizePixels() { - return m_originalResolution; + return m_originalSizePixels; } - float GetValue(); + // Set the m_outputSize value from the m_originalSizePixels and the selected unit + void SetOutputSizeFromInitialImageSize(); + /** @return the pixels per inch value to build the output image. + * It is used by potrace to build the polygonal image + */ int GetOutputDPI(); private: - UNIT m_unit; - float m_value; - int m_originalDPI; - int m_originalResolution; + EDA_UNITS_T m_unit; // The units for m_outputSize (mm, inch, dpi) + double m_outputSize; // The size in m_unit of the output image, depending on + // the user settings. Set to the initial image size + int m_originalDPI; // The image DPI if specified in file, or 0 if unknown + int m_originalSizePixels; // The original image size read from file, in pixels }; class BM2CMP_FRAME : public BM2CMP_FRAME_BASE @@ -85,6 +101,12 @@ private: void OnExportToFile( wxCommandEvent& event ) override; void OnExportToClipboard( wxCommandEvent& event ) override; + ///> @return the EDA_UNITS_T from the m_PixelUnit choice + EDA_UNITS_T getUnitFromSelection(); + + // return a string giving the output size, according to the selected unit + wxString FormatOutputSize( double aSize ); + /** * Generate a schematic library which contains one component: * the logo @@ -130,6 +152,9 @@ private: void OnFormatChange( wxCommandEvent& event ) override; void exportBitmap( OUTPUT_FMT_ID aFormat ); + void LoadSettings(); + void SaveSettings(); + private: wxImage m_Pict_Image; wxBitmap m_Pict_Bitmap; @@ -147,8 +172,6 @@ private: std::unique_ptr m_config; bool m_exportToClipboard; bool m_AspectRatioLocked; - float m_AspectRatio; - std::map m_unitMap = { { MM, _("mm") }, { INCH, _("Inch") }, { MILS, _("Mils") }, - { DPI, _("DPI") } }; + double m_AspectRatio; }; #endif// BITMOP2CMP_GUI_H_