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

Remove atrophied property from appsettings.

This commit is contained in:
Jeff Young 2021-09-01 21:11:54 +01:00
parent 8268c4ad17
commit 651981b2a0
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/eeschema_config.cpp
View File

@ -116,11 +116,12 @@ void SCH_EDIT_FRAME::ShowSchematicSetupDialog( const wxString& aInitialPage )
{
Prj().GetProjectFile().NetSettings().ResolveNetClassAssignments( true );
EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( config() );
EESCHEMA_SETTINGS* cfg = static_cast<EESCHEMA_SETTINGS*>( config() );
SCHEMATIC_SETTINGS& settings = Schematic().Settings();
Schematic().Settings().m_JunctionSize =
settings.m_JunctionSize =
Prj().GetProjectFile().NetSettings().m_NetClasses.GetDefaultPtr()->GetWireWidth()
* cfg->m_Drawing.junction_size_mult_list[ cfg->m_Drawing.junction_size_choice ];
* cfg->m_Drawing.junction_size_mult_list[ settings.m_JunctionSizeChoice ];
if( Schematic().Settings().m_JunctionSize < 1 )
Schematic().Settings().m_JunctionSize = 1;

3
eeschema/eeschema_settings.cpp
View File

@ -167,9 +167,6 @@ EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :
m_params.emplace_back( new PARAM_LIST<double>( "drawing.junction_size_mult_list",
&m_Drawing.junction_size_mult_list, { 0.0, 1.7, 4.0, 6.0, 9.0, 12.0 } ) );
m_params.emplace_back(new PARAM <double>( "drawing.junction_size_mult",
&m_Drawing.junction_size_mult, 4.0 ) );
m_params.emplace_back(new PARAM <int>( "drawing.junction_size_choice",
&m_Drawing.junction_size_choice, 3 ) );

1
eeschema/eeschema_settings.h
View File

@ -95,7 +95,6 @@ public:
std::vector<double> junction_size_mult_list;
// Pulldown index for user default junction dot size (e.g. smallest = 0, small = 1, etc)
int junction_size_choice;
double junction_size_mult; // User selected default multiplier for junction dot size
};
struct INPUT