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

dialog_edit_module_text: fix display bugs 

Displayed angle should be clamped to -90..90, 0 should not be displayed as
blank text, and locale should be used for initial rendering.
This commit is contained in:
Chris Pavlina 2016-04-10 08:23:44 -04:00
parent f294834f4d
commit 4fe676753a
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pcbnew/dialogs/dialog_edit_module_text.cpp
View File

@ -65,7 +65,7 @@ void PCB_BASE_FRAME::InstallTextModOptionsFrame( TEXTE_MODULE* TextMod, wxDC* DC
DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent, DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent,
TEXTE_MODULE* aTextMod, wxDC* aDC ) : TEXTE_MODULE* aTextMod, wxDC* aDC ) :
DialogEditModuleText_base( aParent ), DialogEditModuleText_base( aParent ),
m_OrientValidator( 1, &m_OrientValue, wxNUM_VAL_ZERO_AS_BLANK ) m_OrientValidator( 1, &m_OrientValue )
{ {
m_parent = aParent; m_parent = aParent;
@ -73,7 +73,7 @@ DialogEditModuleText::DialogEditModuleText( PCB_BASE_FRAME* aParent,
m_module = NULL; m_module = NULL;
m_currentText = aTextMod; m_currentText = aTextMod;
m_OrientValidator.SetRange(-90.0, 90.0); m_OrientValidator.SetRange( -90.0, 90.0 );
m_OrientValueCtrl->SetValidator( m_OrientValidator ); m_OrientValueCtrl->SetValidator( m_OrientValidator );
if( m_currentText ) if( m_currentText )
@ -160,19 +160,17 @@ bool DialogEditModuleText::TransferDataToWindow()
m_Show->SetSelection( 1 ); m_Show->SetSelection( 1 );
bool custom_orientation = false; bool custom_orientation = false;
switch( int( m_currentText->GetOrientation() ) ) switch( int( text_orient ) )
{ {
case 0: case 0:
m_Orient->SetSelection( 0 ); m_Orient->SetSelection( 0 );
break; break;
case 900: case 900:
case -2700:
m_Orient->SetSelection( 1 ); m_Orient->SetSelection( 1 );
break; break;
case -900: case -900:
case 2700:
m_Orient->SetSelection( 2 ); m_Orient->SetSelection( 2 );
break; break;
@ -182,10 +180,10 @@ bool DialogEditModuleText::TransferDataToWindow()
break; break;
} }
wxString orientation_fmt;
orientation_fmt.Printf( _( "%0.1f" ), (double)( m_currentText->GetOrientation() ) / 10.0 );
m_OrientValueCtrl->SetValue( orientation_fmt );
m_OrientValueCtrl->Enable( custom_orientation ); m_OrientValueCtrl->Enable( custom_orientation );
m_OrientValue = text_orient / 10.0;
m_OrientValidator.SetWindow( m_OrientValueCtrl );
m_OrientValidator.TransferToWindow();
// Configure the layers list selector // Configure the layers list selector
if( !m_parent->GetBoard()->IsLayerEnabled( m_currentText->GetLayer() ) ) if( !m_parent->GetBoard()->IsLayerEnabled( m_currentText->GetLayer() ) )
@ -211,7 +209,7 @@ bool DialogEditModuleText::TransferDataToWindow()
bool DialogEditModuleText::TransferDataFromWindow() bool DialogEditModuleText::TransferDataFromWindow()
{ {
if( !wxDialog::TransferDataFromWindow() ) if( !Validate() || !DialogEditModuleText_base::TransferDataFromWindow() )
return false; return false;
if( m_module ) if( m_module )