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

EEschema, save correct line style in file when style == DEFAULT. 

previously, when a graphic line style was set to Default,
the line style saved in file was always SOLID.
This is incorrect for graphic lines

Fixes #6017
https://gitlab.com/kicad/code/kicad/issues/6017
This commit is contained in:
jean-pierre charras 2020-10-17 15:16:09 +02:00
parent 827699bed2
commit 114f9062f1
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1138,12 +1138,22 @@ void SCH_SEXPR_PLUGIN::saveLine( SCH_LINE* aLine, int aNestLevel )
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();
if( line_stroke.GetPlotStyle() == PLOT_DASH_TYPE::DEFAULT )
line_stroke.SetPlotStyle( aLine->GetDefaultStyle() );
switch( aLine->GetLayer() )
{
case LAYER_BUS: lineType = "bus"; break;
case LAYER_WIRE: lineType = "wire"; break;
case LAYER_BUS: lineType = "bus"; break;
case LAYER_WIRE: lineType = "wire"; break;
case LAYER_NOTES:
default: lineType = "polyline"; break;
default: lineType = "polyline"; break;
}
m_out->Print( aNestLevel, "(%s (pts (xy %s %s) (xy %s %s))\n",
@ -1153,7 +1163,7 @@ void SCH_SEXPR_PLUGIN::saveLine( SCH_LINE* aLine, int aNestLevel )
FormatInternalUnits( aLine->GetEndPoint().x ).c_str(),
FormatInternalUnits( aLine->GetEndPoint().y ).c_str() );
formatStroke( m_out, aNestLevel + 1, aLine->GetStroke() );
formatStroke( m_out, aNestLevel + 1, line_stroke );
m_out->Print( 0, "\n" );
m_out->Print( aNestLevel, ")\n" );
}