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

Try harder to prevent duplicate axis labels.

This commit is contained in:
Jeff Young 2023-08-02 13:43:08 +01:00
parent 485b768da7
commit f332dba095
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/sim/sim_plot_tab.cpp
View File

@ -100,7 +100,6 @@ static void getSISuffix( double x, const wxString& unit, int& power, wxString& s
static int countDecimalDigits( double x, int maxDigits ) static int countDecimalDigits( double x, int maxDigits )
{ {
// avoid trying to count the decimals of NaN
if( std::isnan( x ) ) if( std::isnan( x ) )
return 0; return 0;
@ -151,23 +150,29 @@ private:
int power = 0; int power = 0;
int digits = 0; int digits = 0;
int constexpr MAX_DIGITS = 3; int constexpr MAX_DIGITS = 3;
bool duplicateLabels = false;
getSISuffix( maxVis, m_unit, power, suffix ); getSISuffix( maxVis, m_unit, power, suffix );
double sf = pow( 10.0, power ); double sf = pow( 10.0, power );
for( mpScaleBase::TickLabel& l : parent::TickLabels() ) for( mpScaleBase::TickLabel& l : parent::TickLabels() )
{ digits = std::max( digits, countDecimalDigits( l.pos / sf, MAX_DIGITS ) );
int k = countDecimalDigits( l.pos / sf, MAX_DIGITS );
digits = std::max( digits, k ); do
}
for( mpScaleBase::TickLabel& l : parent::TickLabels() )
{ {
l.label = formatFloat( l.pos / sf, digits ) + suffix; for( size_t ii = 0; ii < parent::TickLabels().size(); ++ii )
l.visible = true; {
mpScaleBase::TickLabel& l = parent::TickLabels()[ii];
l.label = formatFloat( l.pos / sf, digits ) + suffix;
l.visible = true;
if( ii > 0 && l.label == parent::TickLabels()[ii-1].label )
duplicateLabels = true;
}
} }
while( duplicateLabels && ++digits <= 6 );
} }
private: private: