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

Repair saving of default line styles. 

Note that the file format version was NOT bumped because we were
correctly reading the default, just no writing it.

Fixes https://gitlab.com/kicad/code/kicad/issues/9045
This commit is contained in:
Jeff Young 2021-09-07 00:12:55 +01:00
parent 1792a985a7
commit ad7275f0a3
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/sch_plugins/kicad/sch_sexpr_plugin.cpp
View File

@ -236,8 +236,8 @@ static wxString getLineStyleToken( PLOT_DASH_TYPE aStyle )
case PLOT_DASH_TYPE::DASH: token = "dash"; break; case PLOT_DASH_TYPE::DASH: token = "dash"; break;
case PLOT_DASH_TYPE::DOT: token = "dot"; break; case PLOT_DASH_TYPE::DOT: token = "dot"; break;
case PLOT_DASH_TYPE::DASHDOT: token = "dash_dot"; break; case PLOT_DASH_TYPE::DASHDOT: token = "dash_dot"; break;
case PLOT_DASH_TYPE::SOLID: case PLOT_DASH_TYPE::SOLID: token = "solid"; break;
default: token = "solid"; break; case PLOT_DASH_TYPE::DEFAULT: token = "default"; break;
} }
return token; return token;
@ -1214,16 +1214,8 @@ void SCH_SEXPR_PLUGIN::saveLine( SCH_LINE* aLine, int aNestLevel )
wxString lineType; wxString lineType;
// Lines having the plot style == PLOT_DASH_TYPE::DEFAULT are saved in file
// as SOLID by formatStroke().
// This is incorrect for graphic lines that use the DASH style for default
// So the plot style need adjustments to use the right style
// (TODO perhaps use "default" as keyword for line style in .kicad_sch file)
STROKE_PARAMS line_stroke = aLine->GetStroke(); STROKE_PARAMS line_stroke = aLine->GetStroke();
if( line_stroke.GetPlotStyle() == PLOT_DASH_TYPE::DEFAULT )
line_stroke.SetPlotStyle( aLine->GetDefaultStyle() );
switch( aLine->GetLayer() ) switch( aLine->GetLayer() )
{ {
case LAYER_BUS: lineType = "bus"; break; case LAYER_BUS: lineType = "bus"; break;
@ -1947,8 +1939,7 @@ void SCH_SEXPR_PLUGIN_CACHE::saveField( LIB_FIELD* aField, OUTPUTFORMATTER& aFor
} }
void SCH_SEXPR_PLUGIN_CACHE::savePin( LIB_PIN* aPin, OUTPUTFORMATTER& aFormatter, void SCH_SEXPR_PLUGIN_CACHE::savePin( LIB_PIN* aPin, OUTPUTFORMATTER& aFormatter, int aNestLevel )
int aNestLevel )
{ {
wxCHECK_RET( aPin && aPin->Type() == LIB_PIN_T, "Invalid LIB_PIN object." ); wxCHECK_RET( aPin && aPin->Type() == LIB_PIN_T, "Invalid LIB_PIN object." );