haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bitmap2cmp_gui: fix incorrect initialization of m_Negative when starting bitmap2cmp.

This commit is contained in:
jean-pierre charras 2018-02-20 14:08:02 +01:00
parent ed8ca6ec60
commit bc6763e14d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -162,7 +162,8 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_sliderThreshold->SetValue( tmp ); m_sliderThreshold->SetValue( tmp );
m_config->Read( KEYWORD_BW_NEGATIVE, &tmp, 0 ); m_config->Read( KEYWORD_BW_NEGATIVE, &tmp, 0 );
m_checkNegative->SetValue( tmp != 0 ); m_Negative = tmp != 0;
m_checkNegative->SetValue( m_Negative );
if( m_config->Read( KEYWORD_LAST_FORMAT, &tmp ) ) if( m_config->Read( KEYWORD_LAST_FORMAT, &tmp ) )
{ {
@ -337,7 +338,7 @@ bool BM2CMP_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int
m_Greyscale_Image.Destroy(); m_Greyscale_Image.Destroy();
m_Greyscale_Image = m_Pict_Image.ConvertToGreyscale( ); m_Greyscale_Image = m_Pict_Image.ConvertToGreyscale( );
if( m_Negative > 0 ) if( m_Negative )
NegateGreyscaleImage( ); NegateGreyscaleImage( );
m_Greyscale_Bitmap = wxBitmap( m_Greyscale_Image ); m_Greyscale_Bitmap = wxBitmap( m_Greyscale_Image );
@ -438,7 +439,7 @@ void BM2CMP_FRAME::OnNegativeClicked( wxCommandEvent& )
NegateGreyscaleImage(); NegateGreyscaleImage();
m_Greyscale_Bitmap = wxBitmap( m_Greyscale_Image ); m_Greyscale_Bitmap = wxBitmap( m_Greyscale_Image );
Binarize( (double)m_sliderThreshold->GetValue()/m_sliderThreshold->GetMax() ); Binarize( (double)m_sliderThreshold->GetValue()/m_sliderThreshold->GetMax() );
m_Negative = !m_Negative; m_Negative = m_checkNegative->GetValue();
Refresh(); Refresh();
} }