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

Formatting.

This commit is contained in:
Jeff Young 2022-08-15 23:43:30 +01:00
parent 34a5a32a52
commit e015f5b086
5 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
3d-viewer/3d_viewer/eda_3d_viewer_settings.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2020-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@ -205,11 +205,12 @@ EDA_3D_VIEWER_SETTINGS::EDA_3D_VIEWER_SETTINGS()
registerMigration( 0, 1, std::bind( &EDA_3D_VIEWER_SETTINGS::migrateSchema0to1, this ) );
registerMigration( 1, 2, [&]() -> bool
{
Set( "render.opengl_copper_thickness", false );
return true;
} );
registerMigration( 1, 2,
[&]() -> bool
{
Set( "render.opengl_copper_thickness", false );
return true;
} );
}

1
common/settings/app_settings.cpp
View File

@ -108,7 +108,6 @@ APP_SETTINGS_BASE::APP_SETTINGS_BASE( const std::string& aFilename, int aSchemaV
m_params.emplace_back( new PARAM<int>( "system.max_undo_items",
&m_System.max_undo_items, 0 ) );
m_params.emplace_back( new PARAM_LIST<wxString>( "system.file_history",
&m_System.file_history, {} ) );

2
common/settings/color_settings.cpp
View File

@ -232,7 +232,7 @@ COLOR_SETTINGS::COLOR_SETTINGS( const wxString& aFilename, bool aAbsolutePath )
[&]()
{
// Fix LAYER_VIA_HOLES color - before version 2, this setting had no effect
nlohmann::json::json_pointer ptr( "/board/via_hole");
nlohmann::json::json_pointer ptr( "/board/via_hole" );
( *m_internals )[ptr] = COLOR4D( 0.5, 0.4, 0, 0.8 ).ToWxString( wxC2S_CSS_SYNTAX );

19
eeschema/eeschema_settings.cpp
View File

@ -43,16 +43,17 @@ using namespace T_BOMCFG_T; // for the BOM_CFG_PARSER parser and its keyword
const int eeschemaSchemaVersion = 1;
/// Default value for bom.plugins
const nlohmann::json defaultBomPlugins = {
const nlohmann::json defaultBomPlugins =
{
{ "name", "bom_csv_grouped_by_value" },
{ "path", "bom_csv_grouped_by_value.py" }
},
{
{ "name", "bom_csv_grouped_by_value_with_fp" },
{ "path", "bom_csv_grouped_by_value_with_fp.py" }
},
};
{
{ "name", "bom_csv_grouped_by_value" },
{ "path", "bom_csv_grouped_by_value.py" }
},
{
{ "name", "bom_csv_grouped_by_value_with_fp" },
{ "path", "bom_csv_grouped_by_value_with_fp.py" }
},
};
EESCHEMA_SETTINGS::EESCHEMA_SETTINGS() :

17
eeschema/schematic_settings.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 CERN
* Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
* @author Jon Evans <jon@craftyjon.com>
*
* This program is free software: you can redistribute it and/or modify it
@ -219,15 +219,16 @@ SCHEMATIC_SETTINGS::SCHEMATIC_SETTINGS( JSON_SETTINGS* aParent, const std::strin
m_NgspiceSimulatorSettings =
std::make_shared<NGSPICE_SIMULATOR_SETTINGS>( this, "ngspice" );
registerMigration( 0, 1, [&]() -> bool
{
OPT<double> tor = Get<double>( "drawing.text_offset_ratio" );
registerMigration( 0, 1,
[&]() -> bool
{
OPT<double> tor = Get<double>( "drawing.text_offset_ratio" );
if( tor.is_initialized() )
Set( "drawing.label_size_ratio", tor.get() );
if( tor.is_initialized() )
Set( "drawing.label_size_ratio", tor.get() );
return true;
} );
return true;
} );
}