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

Normalize phase angles.

This commit is contained in:
Jeff Young 2024-06-14 19:01:13 +01:00
parent a2cbd1ff21
commit ac576d7e0a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/sim/spice_value.cpp
View File

@ -35,6 +35,7 @@
#include <confirm.h> #include <confirm.h>
#include <common.h> #include <common.h>
#include <locale_io.h> #include <locale_io.h>
#include <geometry/eda_angle.h>
void SPICE_VALUE_FORMAT::FromString( const wxString& aString ) void SPICE_VALUE_FORMAT::FromString( const wxString& aString )
@ -223,18 +224,17 @@ wxString SPICE_VALUE::ToString( const SPICE_VALUE_FORMAT& aFormat )
{ {
wxString range( aFormat.Range ); wxString range( aFormat.Range );
if( range.EndsWith( wxS( "°" ) ) )
{
EDA_ANGLE angle( m_base * std::pow( 10, (int) m_prefix ), DEGREES_T );
angle.Normalize180();
return wxString::FromCDouble( angle.AsDegrees(), aFormat.Precision ) + wxS( "°" );
}
if( range.StartsWith( wxS( "~" ) ) ) if( range.StartsWith( wxS( "~" ) ) )
{ {
// Don't use SI prefixes with degrees unless they specifically ask for it. Normalize();
if( range.EndsWith( wxS( "°" ) ) ) range = si_prefix( m_prefix ) + range.Right( range.Length() - 1 );
{
range = range.Right( range.Length() - 1 );
}
else
{
Normalize();
range = si_prefix( m_prefix ) + range.Right( range.Length() - 1 );
}
} }
else else
{ {