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

Add support for data type to UNIT_BINDER

This commit is contained in:
Jon Evans 2020-06-25 22:18:29 -04:00
parent 0d4ee39f75
commit 7532cf4ab0
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/widgets/unit_binder.cpp
View File

@ -44,12 +44,13 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
m_unitLabel( aUnitLabel ),
m_eval( aParent->GetUserUnits(), aUseMils )
{
m_units = aParent->GetUserUnits();
m_useMils = aUseMils;
m_units = aParent->GetUserUnits();
m_useMils = aUseMils;
m_dataType = EDA_DATA_TYPE::DISTANCE;
m_allowEval = allowEval && dynamic_cast<wxTextEntry*>( m_value );
m_needsEval = false;
m_selStart = 0;
m_selEnd = 0;
m_selStart = 0;
m_selEnd = 0;
wxTextEntry* textEntry = dynamic_cast<wxTextEntry*>( m_value );
@ -59,7 +60,7 @@ UNIT_BINDER::UNIT_BINDER( EDA_DRAW_FRAME* aParent,
textEntry->ChangeValue( wxT( "0" ) );
}
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils, m_dataType ) );
m_value->Connect( wxEVT_SET_FOCUS, wxFocusEventHandler( UNIT_BINDER::onSetFocus ), NULL, this );
m_value->Connect( wxEVT_KILL_FOCUS, wxFocusEventHandler( UNIT_BINDER::onKillFocus ), NULL, this );
@ -79,7 +80,14 @@ void UNIT_BINDER::SetUnits( EDA_UNITS aUnits, bool aUseMils )
{
m_units = aUnits;
m_useMils = aUseMils;
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils, m_dataType ) );
}
void UNIT_BINDER::SetDataType( EDA_DATA_TYPE aDataType )
{
m_dataType = aDataType;
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils, m_dataType ) );
}
@ -234,7 +242,7 @@ void UNIT_BINDER::SetValue( wxString aValue )
if( m_allowEval )
m_eval.Clear();
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils, m_dataType ) );
}
@ -257,7 +265,7 @@ void UNIT_BINDER::ChangeValue( const wxString& aValue )
if( m_allowEval )
m_eval.Clear();
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils ) );
m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units, m_useMils, m_dataType ) );
}

7
include/widgets/unit_binder.h
View File

@ -65,6 +65,12 @@ public:
*/
virtual void SetUnits( EDA_UNITS aUnits, bool aUseMils = false );
/**
* Used to override the datatype of the displayed property (default is DISTANCE)
* @param aDataType is the datatype to use for the units text display
*/
void SetDataType( EDA_DATA_TYPE aDataType );
/**
* Function SetValue
* Sets new value (in Internal Units) for the text field, taking care of units conversion.
@ -165,6 +171,7 @@ protected:
///> Currently used units.
EDA_UNITS m_units;
bool m_useMils;
EDA_DATA_TYPE m_dataType;
///> Validation support.
wxString m_errorMessage;