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

Save actual control values; GetOriginalText is only for eval. 

Fixes https://gitlab.com/kicad/code/kicad/issues/9575
This commit is contained in:
Jeff Young 2021-11-09 13:52:20 +00:00
parent 0631c8fc74
commit c0a6014114
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcbnew/dialogs/dialog_move_exact.cpp
View File

@ -75,8 +75,8 @@ DIALOG_MOVE_EXACT::DIALOG_MOVE_EXACT( PCB_BASE_FRAME *aParent, wxPoint& aTransla
// and set up the entries according to the saved options // and set up the entries according to the saved options
m_polarCoords->SetValue( m_options.polarCoords ); m_polarCoords->SetValue( m_options.polarCoords );
m_moveX.SetValue( m_options.entry1 ); m_xEntry->ChangeValue( m_options.entry1 );
m_moveY.SetValue( m_options.entry2 ); m_yEntry->ChangeValue( m_options.entry2 );
m_rotate.SetUnits( EDA_UNITS::DEGREES ); m_rotate.SetUnits( EDA_UNITS::DEGREES );
m_rotate.SetValue( m_options.entryRotation ); m_rotate.SetValue( m_options.entryRotation );
@ -247,18 +247,14 @@ bool DIALOG_MOVE_EXACT::TransferDataFromWindow()
m_rotation = m_rotate.GetDoubleValue(); m_rotation = m_rotate.GetDoubleValue();
m_rotationAnchor = m_menuIDs[ m_anchorOptions->GetSelection() ]; m_rotationAnchor = m_menuIDs[ m_anchorOptions->GetSelection() ];
if( ok ) // save the settings
{ m_options.polarCoords = m_polarCoords->GetValue();
// save the settings m_options.entry1 = m_xEntry->GetValue();
m_options.polarCoords = m_polarCoords->GetValue(); m_options.entry2 = m_yEntry->GetValue();
m_options.entry1 = m_moveX.GetOriginalText(); m_options.entryRotation = m_rotEntry->GetValue();
m_options.entry2 = m_moveY.GetOriginalText(); m_options.entryAnchorSelection = (size_t) std::max( m_anchorOptions->GetSelection(), 0 );
m_options.entryRotation = m_rotate.GetOriginalText();
m_options.entryAnchorSelection = (size_t) std::max( m_anchorOptions->GetSelection(), 0 );
return true;
}
return false; return ok;
} }