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

Activate teardrops: remove advanced config option and add teardrop keywords in files. (the ability to read teardrop keywords was added some time ago)

This commit is contained in:
jean-pierre charras 2022-06-17 19:41:53 +02:00
parent c2707e0c8d
commit f20cb0fda8
5 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/advanced_config.cpp
View File

@ -318,7 +318,6 @@ ADVANCED_CFG::ADVANCED_CFG()
m_CompactSave = false; m_CompactSave = false;
m_UpdateUIEventInterval = 0; m_UpdateUIEventInterval = 0;
m_AllowTeardrops = false;
m_ShowRepairSchematic = false; m_ShowRepairSchematic = false;
m_3DRT_BevelHeight_um = 30; m_3DRT_BevelHeight_um = 30;
@ -453,9 +452,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::AllowManualCanvasScale, configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::AllowManualCanvasScale,
&m_AllowManualCanvasScale, m_AllowManualCanvasScale ) ); &m_AllowManualCanvasScale, m_AllowManualCanvasScale ) );
configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::AllowTeardrops,
&m_AllowTeardrops, m_AllowTeardrops ) );
configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::V3DRT_BevelHeight_um, configParams.push_back( new PARAM_CFG_INT( true, AC_KEYS::V3DRT_BevelHeight_um,
&m_3DRT_BevelHeight_um, m_3DRT_BevelHeight_um, &m_3DRT_BevelHeight_um, m_3DRT_BevelHeight_um,
0, std::numeric_limits<int>::max(), 0, std::numeric_limits<int>::max(),

5
include/advanced_config.h
View File

@ -220,11 +220,6 @@ public:
bool m_AllowManualCanvasScale; bool m_AllowManualCanvasScale;
/**
* Allows creating / deleting teardrops
*/
bool m_AllowTeardrops;
/** /**
* 3D-Viewer, Raytracing * 3D-Viewer, Raytracing
* Bevel height of layer items. Controls the start of curvature normal on the edge. * Bevel height of layer items. Controls the start of curvature normal on the edge.

14
pcbnew/menubar_pcb_editor.cpp
View File

@ -407,16 +407,10 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
toolsMenu->Add( ACTIONS::showFootprintEditor ); toolsMenu->Add( ACTIONS::showFootprintEditor );
toolsMenu->Add( PCB_ACTIONS::updateFootprints ); toolsMenu->Add( PCB_ACTIONS::updateFootprints );
// Currently: available only with advanced_config m_AllowTeardrops = true // Add/remove teardrops menuitems:
// (AllowTeardrops = 1) toolsMenu->AppendSeparator();
if( ADVANCED_CFG::GetCfg().m_AllowTeardrops ) toolsMenu->Add( _( "Add Teardrops" ), "", ID_RUN_TEARDROP_TOOL, BITMAPS::via );
{ toolsMenu->Add( _( "Remove Teardrops" ), "", ID_REMOVE_TEARDROP_TOOL, BITMAPS::via );
toolsMenu->AppendSeparator();
toolsMenu->Add( _( "Add Teardrops" ), "",
ID_RUN_TEARDROP_TOOL, BITMAPS::via );
toolsMenu->Add( _( "Remove Teardrops" ), "",
ID_REMOVE_TEARDROP_TOOL, BITMAPS::via );
}
toolsMenu->AppendSeparator(); toolsMenu->AppendSeparator();
toolsMenu->Add( PCB_ACTIONS::cleanupTracksAndVias ); toolsMenu->Add( PCB_ACTIONS::cleanupTracksAndVias );

5
pcbnew/plugins/kicad/pcb_plugin.cpp
View File

@ -2092,8 +2092,7 @@ void PCB_PLUGIN::format( const ZONE* aZone, int aNestLevel ) const
if( aZone->GetAssignedPriority() > 0 ) if( aZone->GetAssignedPriority() > 0 )
m_out->Print( aNestLevel+1, "(priority %d)\n", aZone->GetAssignedPriority() ); m_out->Print( aNestLevel+1, "(priority %d)\n", aZone->GetAssignedPriority() );
// Disable teardrop keyword in file only temporarily (WIP) to avoid file format change // Add teardrop keywords in file: (attr (teardrop (type xxx)))where xxx is the teardrop type
#if 0
if( aZone->IsTeardropArea() ) if( aZone->IsTeardropArea() )
{ {
const char* td_type; const char* td_type;
@ -2112,7 +2111,7 @@ void PCB_PLUGIN::format( const ZONE* aZone, int aNestLevel ) const
m_out->Print( aNestLevel+1, "(attr (teardrop (type %s)))\n", td_type ); m_out->Print( aNestLevel+1, "(attr (teardrop (type %s)))\n", td_type );
} }
#endif
m_out->Print( aNestLevel+1, "(connect_pads" ); m_out->Print( aNestLevel+1, "(connect_pads" );
switch( aZone->GetPadConnection() ) switch( aZone->GetPadConnection() )

3
pcbnew/plugins/kicad/pcb_plugin.h
View File

@ -121,7 +121,8 @@ class SHAPE_LINE_CHAIN;
//#define SEXPR_BOARD_FILE_VERSION 20220308 // Knockout text and Locked graphic text property saved //#define SEXPR_BOARD_FILE_VERSION 20220308 // Knockout text and Locked graphic text property saved
//#define SEXPR_BOARD_FILE_VERSION 20220331 // Plot on all layers selection setting //#define SEXPR_BOARD_FILE_VERSION 20220331 // Plot on all layers selection setting
//#define SEXPR_BOARD_FILE_VERSION 20220417 // Automatic dimension precisions //#define SEXPR_BOARD_FILE_VERSION 20220417 // Automatic dimension precisions
#define SEXPR_BOARD_FILE_VERSION 20220427 // Exclude Edge.Cuts & Margin from fp private layers //#define SEXPR_BOARD_FILE_VERSION 20220427 // Exclude Edge.Cuts & Margin from fp private layers
#define SEXPR_BOARD_FILE_VERSION 20220609 // Add teardrop keywords to identify teardrop zones
#define BOARD_FILE_HOST_VERSION 20200825 ///< Earlier files than this include the host tag #define BOARD_FILE_HOST_VERSION 20200825 ///< Earlier files than this include the host tag
#define LEGACY_ARC_FORMATTING 20210925 ///< These were the last to use old arc formatting #define LEGACY_ARC_FORMATTING 20210925 ///< These were the last to use old arc formatting