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

Regularize formatting.

This commit is contained in:
Jeff Young 2020-08-30 17:46:01 +01:00
parent 921703c711
commit 45ed91a405
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eeschema/schematic_settings.cpp
View File

@ -71,18 +71,22 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
&m_DefaultBusThickness, Mils2iu( defaultBusThickness ), &m_DefaultBusThickness, Mils2iu( defaultBusThickness ),
Mils2iu( 5 ), Mils2iu( 1000 ), 1 / IU_PER_MILS ) ); Mils2iu( 5 ), Mils2iu( 1000 ), 1 / IU_PER_MILS ) );
m_params.emplace_back( new PARAM_SCALED<int>( "drawing.default_text_size", &m_DefaultTextSize, m_params.emplace_back( new PARAM_SCALED<int>( "drawing.default_text_size",
&m_DefaultTextSize,
Mils2iu( defaultTextSize ), Mils2iu( 5 ), Mils2iu( 1000 ), Mils2iu( defaultTextSize ), Mils2iu( 5 ), Mils2iu( 1000 ),
1 / IU_PER_MILS ) ); 1 / IU_PER_MILS ) );
m_params.emplace_back( new PARAM<double>( "drawing.text_offset_ratio", &m_TextOffsetRatio, m_params.emplace_back( new PARAM<double>( "drawing.text_offset_ratio",
&m_TextOffsetRatio,
(double) TXT_MARGIN / DEFAULT_SIZE_TEXT, -200.0, 200.0 ) ); (double) TXT_MARGIN / DEFAULT_SIZE_TEXT, -200.0, 200.0 ) );
m_params.emplace_back( new PARAM_SCALED<int>( "drawing.pin_symbol_size", &m_PinSymbolSize, m_params.emplace_back( new PARAM_SCALED<int>( "drawing.pin_symbol_size",
&m_PinSymbolSize,
Mils2iu( defaultPinSymbolSize ), Mils2iu( 5 ), Mils2iu( 1000 ), Mils2iu( defaultPinSymbolSize ), Mils2iu( 5 ), Mils2iu( 1000 ),
1 / IU_PER_MILS ) ); 1 / IU_PER_MILS ) );
m_params.emplace_back( new PARAM_SCALED<int>( "drawing.default_junction_size", &m_JunctionSize, m_params.emplace_back( new PARAM_SCALED<int>( "drawing.default_junction_size",
&m_JunctionSize,
Mils2iu( defaultJunctionSize ), Mils2iu( 5 ), Mils2iu( 1000 ), 1 / IU_PER_MILS ) ); Mils2iu( defaultJunctionSize ), Mils2iu( 5 ), Mils2iu( 1000 ), 1 / IU_PER_MILS ) );
m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "drawing.field_names", m_params.emplace_back( new PARAM_LAMBDA<nlohmann::json>( "drawing.field_names",
@ -126,25 +130,27 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
}, {} ) ); }, {} ) );
// TOOD(JE) get rid of this static // TOOD(JE) get rid of this static
m_params.emplace_back( new PARAM<wxString>( m_params.emplace_back( new PARAM<wxString>( "page_layout_descr_file",
"page_layout_descr_file", &BASE_SCREEN::m_PageLayoutDescrFileName, "" ) ); &BASE_SCREEN::m_PageLayoutDescrFileName, "" ) );
m_params.emplace_back( new PARAM<wxString>( "plot_directory", &m_PlotDirectoryName, "" ) ); m_params.emplace_back( new PARAM<wxString>( "plot_directory",
&m_PlotDirectoryName, "" ) );
m_params.emplace_back( new PARAM<wxString>( "net_format_name", &m_NetFormatName, "" ) ); m_params.emplace_back( new PARAM<wxString>( "net_format_name",
&m_NetFormatName, "" ) );
m_params.emplace_back( m_params.emplace_back( new PARAM<bool>( "spice_adjust_passive_values",
new PARAM<bool>( "spice_adjust_passive_values", &m_SpiceAdjustPassiveValues, false ) ); &m_SpiceAdjustPassiveValues, false ) );
m_params.emplace_back( new PARAM<wxString>( "spice_external_command", m_params.emplace_back( new PARAM<wxString>( "spice_external_command",
&m_SpiceCommandString, "spice \"%I\"" ) ); &m_SpiceCommandString, "spice \"%I\"" ) );
// TODO(JE) should we keep these LIB_PART:: things around? // TODO(JE) should we keep these LIB_PART:: things around?
m_params.emplace_back( new PARAM<int>( m_params.emplace_back( new PARAM<int>( "subpart_id_separator",
"subpart_id_separator", LIB_PART::SubpartIdSeparatorPtr(), 0, 0, 126 ) ); LIB_PART::SubpartIdSeparatorPtr(), 0, 0, 126 ) );
m_params.emplace_back( m_params.emplace_back( new PARAM<int>( "subpart_first_id",
new PARAM<int>( "subpart_first_id", LIB_PART::SubpartFirstIdPtr(), 'A', '1', 'z' ) ); LIB_PART::SubpartFirstIdPtr(), 'A', '1', 'z' ) );
} }