realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove default line styles from all items except eeschema wires and buses.

Browse Source
This commit is contained in:
Jeff Young 2025-01-20 11:01:01 +00:00
parent c50ce416f2
commit 6b6729284c
19 changed files with 156 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/eda_shape.cpp
View File

@ -2206,16 +2206,15 @@ static struct EDA_SHAPE_DESC
.Map( SHAPE_T::POLY, _HKI( "Polygon" ) )
.Map( SHAPE_T::BEZIER, _HKI( "Bezier" ) );
auto& plotDashTypeEnum = ENUM_MAP<LINE_STYLE>::Instance();
ENUM_MAP<LINE_STYLE>& lineStyleEnum = ENUM_MAP<LINE_STYLE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
if( lineStyleEnum.Choices().GetCount() == 0 )
{
plotDashTypeEnum.Map( LINE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
lineStyleEnum.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();

10
eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -66,8 +66,6 @@ static wxString g_netFilter;
static bool g_filterSelected;
#define DEFAULT_STYLE _( "Default" )
class DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS : public DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE
{
SCH_EDIT_FRAME* m_parent;
@ -115,7 +113,6 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS( SCH_
{
m_parent = parent;
m_lineStyle->Append( DEFAULT_STYLE );
m_lineStyle->Append( INDETERMINATE_ACTION );
m_textColorSwatch->SetSwatchColor( COLOR4D::UNSPECIFIED, false );
@ -335,12 +332,7 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( SCH_COMMIT* aCommit,
stroke.SetWidth( m_lineWidth.GetValue() );
if( m_lineStyle->GetStringSelection() != INDETERMINATE_ACTION )
{
if( m_lineStyle->GetStringSelection() == DEFAULT_STYLE )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
else
stroke.SetLineStyle( (LINE_STYLE) m_lineStyle->GetSelection() );
}
stroke.SetLineStyle( (LINE_STYLE) m_lineStyle->GetSelection() );
if( m_setColor->GetValue() )
stroke.SetColor( m_colorSwatch->GetSwatchColor() );

8
eeschema/dialogs/dialog_line_properties.cpp
View File

@ -52,8 +52,6 @@ DIALOG_LINE_PROPERTIES::DIALOG_LINE_PROPERTIES( SCH_EDIT_FRAME* aParent,
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_typeCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_typeCombo->Append( DEFAULT_STYLE );
SetupStandardButtons( { { wxID_APPLY, _( "Default" ) } } );
// Now all widgets have the size fixed, call FinishDialogSettings
@ -99,12 +97,10 @@ bool DIALOG_LINE_PROPERTIES::TransferDataToWindow()
{
int style = static_cast<int>( first_stroke_item->GetStroke().GetLineStyle() );
if( style == -1 )
m_typeCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_typeCombo->SetSelection( style );
else
wxFAIL_MSG( wxT( "Line type not found in the type lookup map" ) );
m_typeCombo->SetSelection( 0 );
}
else
{

4
eeschema/dialogs/dialog_shape_properties.cpp
View File

@ -58,8 +58,6 @@ DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( SCH_BASE_FRAME* aParent, SCH_S
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_borderStyleCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_borderStyleCombo->Append( DEFAULT_STYLE );
m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
m_fillColorSwatch->SetSwatchBackground( schematicBackground );
@ -329,7 +327,7 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_borderStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

19
eeschema/dialogs/dialog_table_properties.cpp
View File

@ -103,9 +103,6 @@ DIALOG_TABLE_PROPERTIES::DIALOG_TABLE_PROPERTIES( SCH_EDIT_FRAME* aFrame, SCH_TA
m_separatorsStyleCombo->Append( lineStyleDesc.name, KiBitmap( lineStyleDesc.bitmap ) );
}
m_borderStyleCombo->Append( DEFAULT_STYLE );
m_separatorsStyleCombo->Append( DEFAULT_STYLE );
KIGFX::COLOR4D canvas = aFrame->GetColorSettings()->GetColor( LAYER_SCHEMATIC_BACKGROUND );
m_borderColorSwatch->SetSwatchBackground( canvas );
m_separatorsColorSwatch->SetSwatchBackground( canvas );
@ -192,12 +189,10 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( m_table->GetBorderStroke().GetLineStyle() );
if( style == -1 )
m_borderStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_borderStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_borderStyleCombo->SetSelection( 0 );
m_borderWidth.Enable( m_table->StrokeExternal() || m_table->StrokeHeader() );
m_borderColorLabel->Enable( m_table->StrokeExternal() || m_table->StrokeHeader() );
@ -218,12 +213,10 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataToWindow()
style = static_cast<int>( m_table->GetSeparatorsStroke().GetLineStyle() );
if( style == -1 )
m_separatorsStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_separatorsStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_separatorsStyleCombo->SetSelection( 0 );
m_separatorsWidth.Enable( rows || cols );
m_separatorsColorLabel->Enable( rows || cols );
@ -352,7 +345,7 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_borderStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );
@ -375,7 +368,7 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_separatorsStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

13
eeschema/dialogs/dialog_text_properties.cpp
View File

@ -63,10 +63,7 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_BASE_FRAME* aParent, SCH_ITE
m_borderColorSwatch->SetSwatchBackground( schematicBackground );
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_borderStyleCombo->Append( lineStyleDesc.name,
KiBitmapBundle( lineStyleDesc.bitmap ) );
m_borderStyleCombo->Append( DEFAULT_STYLE );
m_borderStyleCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_fillColorSwatch->SetDefaultColor( COLOR4D::UNSPECIFIED );
m_fillColorSwatch->SetSwatchBackground( schematicBackground );
@ -324,12 +321,10 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( textBox->GetStroke().GetLineStyle() );
if( style == -1 )
m_borderStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_borderStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_borderStyleCombo->SetSelection( 0 );
m_borderWidth.Enable( textBox->GetWidth() >= 0 );
m_borderColorLabel->Enable( textBox->GetWidth() >= 0 );
@ -574,7 +569,7 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_borderStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

39
eeschema/sch_bus_entry.cpp
View File

@ -203,7 +203,7 @@ void SCH_BUS_ENTRY_BASE::SetBusEntryColor( const COLOR4D& aColor )
}
LINE_STYLE SCH_BUS_ENTRY_BASE::GetLineStyle() const
LINE_STYLE SCH_BUS_ENTRY_BASE::GetEffectiveLineStyle() const
{
if( m_stroke.GetLineStyle() != LINE_STYLE::DEFAULT )
m_lastResolvedLineStyle = m_stroke.GetLineStyle();
@ -274,7 +274,7 @@ void SCH_BUS_ENTRY_BASE::Print( const SCH_RENDER_SETTINGS* aSettings, int aUnit,
VECTOR2I end = GetEnd() + aOffset;
int penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth();
if( GetLineStyle() <= LINE_STYLE::FIRST_TYPE )
if( GetEffectiveLineStyle() <= LINE_STYLE::FIRST_TYPE )
{
GRLine( DC, start.x, start.y, end.x, end.y, penWidth, color );
}
@ -282,7 +282,7 @@ void SCH_BUS_ENTRY_BASE::Print( const SCH_RENDER_SETTINGS* aSettings, int aUnit,
{
SHAPE_SEGMENT segment( start, end );
STROKE_PARAMS::Stroke( &segment, GetLineStyle(), penWidth, aSettings,
STROKE_PARAMS::Stroke( &segment, GetEffectiveLineStyle(), penWidth, aSettings,
[&]( const VECTOR2I& a, const VECTOR2I& b )
{
GRLine( DC, a.x, a.y, b.x, b.y, penWidth, color );
@ -507,7 +507,7 @@ void SCH_BUS_ENTRY_BASE::Plot( PLOTTER* aPlotter, bool aBackground, const SCH_PL
aPlotter->SetCurrentLineWidth( penWidth );
aPlotter->SetColor( color );
aPlotter->SetDash( penWidth, GetLineStyle() );
aPlotter->SetDash( penWidth, GetEffectiveLineStyle() );
aPlotter->MoveTo( m_pos );
aPlotter->FinishTo( GetEnd() );
@ -652,31 +652,26 @@ static struct SCH_BUS_ENTRY_DESC
propMgr.InheritsAfter( TYPE_HASH( SCH_BUS_WIRE_ENTRY ), TYPE_HASH( SCH_BUS_ENTRY_BASE ) );
propMgr.InheritsAfter( TYPE_HASH( SCH_BUS_BUS_ENTRY ), TYPE_HASH( SCH_BUS_ENTRY_BASE ) );
ENUM_MAP<LINE_STYLE>& plotDashTypeEnum = ENUM_MAP<LINE_STYLE>::Instance();
ENUM_MAP<WIRE_STYLE>& wireLineStyleEnum = ENUM_MAP<WIRE_STYLE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
if( wireLineStyleEnum.Choices().GetCount() == 0 )
{
plotDashTypeEnum.Map( LINE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
wireLineStyleEnum.Map( WIRE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( WIRE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( WIRE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( WIRE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( WIRE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( WIRE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
// TODO: Maybe SCH_BUS_ENTRY_BASE should inherit from or mix in with SCH_LINE
void ( SCH_BUS_ENTRY_BASE::*lineStyleSetter )( LINE_STYLE ) =
&SCH_BUS_ENTRY_BASE::SetLineStyle;
propMgr.AddProperty( new PROPERTY_ENUM<SCH_BUS_ENTRY_BASE, LINE_STYLE>(
_HKI( "Line Style" ),
lineStyleSetter, &SCH_BUS_ENTRY_BASE::GetLineStyle ) );
propMgr.AddProperty( new PROPERTY_ENUM<SCH_BUS_ENTRY_BASE, WIRE_STYLE>( _HKI( "Line Style" ),
&SCH_BUS_ENTRY_BASE::SetWireStyle, &SCH_BUS_ENTRY_BASE::GetWireStyle ) );
propMgr.AddProperty( new PROPERTY<SCH_BUS_ENTRY_BASE, int>( _HKI( "Line Width" ),
&SCH_BUS_ENTRY_BASE::SetPenWidth, &SCH_BUS_ENTRY_BASE::GetPenWidth,
PROPERTY_DISPLAY::PT_SIZE ) );
&SCH_BUS_ENTRY_BASE::SetPenWidth, &SCH_BUS_ENTRY_BASE::GetPenWidth,
PROPERTY_DISPLAY::PT_SIZE ) );
propMgr.AddProperty( new PROPERTY<SCH_BUS_ENTRY_BASE, COLOR4D>( _HKI( "Color" ),
&SCH_BUS_ENTRY_BASE::SetBusEntryColor, &SCH_BUS_ENTRY_BASE::GetBusEntryColor ) );
&SCH_BUS_ENTRY_BASE::SetBusEntryColor, &SCH_BUS_ENTRY_BASE::GetBusEntryColor ) );
}
} _SCH_BUS_ENTRY_DESC;

8
eeschema/sch_bus_entry.h
View File

@ -81,8 +81,14 @@ public:
virtual STROKE_PARAMS GetStroke() const override { return m_stroke; }
virtual void SetStroke( const STROKE_PARAMS& aStroke ) override { m_stroke = aStroke; }
LINE_STYLE GetLineStyle() const;
void SetLineStyle( LINE_STYLE aStyle );
LINE_STYLE GetEffectiveLineStyle() const;
// Special Getter/Setters for properties panel. Required because it uses WIRE_STYLE instead
// of LINE_STYLE. (The two enums are identical, but we expose "default" in the WIRE_STYLE
// property while we don't with the LINE_STYLE property.)
void SetWireStyle( WIRE_STYLE aStyle ) { SetLineStyle( (LINE_STYLE) aStyle ); }
WIRE_STYLE GetWireStyle() const { return (WIRE_STYLE) GetStroke().GetLineStyle(); }
COLOR4D GetBusEntryColor() const;
void SetBusEntryColor( const COLOR4D& aColor );

18
eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp
View File

@ -1983,17 +1983,17 @@ void SCH_IO_KICAD_LEGACY::saveLine( SCH_LINE* aLine )
// Write line style (width, type, color) only for non default values
if( aLine->IsGraphicLine() )
{
if( aLine->GetLineWidth() != 0 )
m_out->Print( 0, " %s %d", T_WIDTH, schIUScale.IUToMils( aLine->GetLineWidth() ) );
const STROKE_PARAMS& stroke = aLine->GetStroke();
m_out->Print( 0, " %s %s", T_STYLE,
TO_UTF8( STROKE_PARAMS::GetLineStyleToken( aLine->GetLineStyle() ) ) );
if( stroke.GetWidth() != 0 )
m_out->Print( 0, " %s %d", T_WIDTH, schIUScale.IUToMils( stroke.GetWidth() ) );
if( aLine->GetLineColor() != COLOR4D::UNSPECIFIED )
{
m_out->Print( 0, " %s",
TO_UTF8( aLine->GetLineColor().ToCSSString() ) );
}
m_out->Print( 0, " %s %s",
T_STYLE,
TO_UTF8( STROKE_PARAMS::GetLineStyleToken( stroke.GetLineStyle() ) ) );
if( stroke.GetColor() != COLOR4D::UNSPECIFIED )
m_out->Print( 0, " %s", TO_UTF8( stroke.GetColor().ToCSSString() ) );
}
m_out->Print( 0, "\n" );

78
eeschema/sch_line.cpp
View File

@ -40,6 +40,7 @@
#include <api/api_enums.h>
#include <api/api_utils.h>
#include <api/schematic/schematic_types.pb.h>
#include <properties/property.h>
SCH_LINE::SCH_LINE( const VECTOR2I& pos, int layer ) :
@ -276,25 +277,10 @@ COLOR4D SCH_LINE::GetLineColor() const
}
void SCH_LINE::SetLineStyle( const int aStyleId )
{
SetLineStyle( static_cast<LINE_STYLE>( aStyleId ) );
}
void SCH_LINE::SetLineStyle( const LINE_STYLE aStyle )
{
m_stroke.SetLineStyle( aStyle );
m_lastResolvedLineStyle = GetLineStyle();
}
LINE_STYLE SCH_LINE::GetLineStyle() const
{
if( m_stroke.GetLineStyle() != LINE_STYLE::DEFAULT )
return m_stroke.GetLineStyle();
return LINE_STYLE::SOLID;
m_lastResolvedLineStyle = GetEffectiveLineStyle();
}
@ -936,7 +922,7 @@ void SCH_LINE::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_IT
aList.emplace_back( _( "Line Type" ), msg );
LINE_STYLE lineStyle = GetLineStyle();
LINE_STYLE lineStyle = GetStroke().GetLineStyle();
if( GetEffectiveLineStyle() != lineStyle )
aList.emplace_back( _( "Line Style" ), _( "from netclass" ) );
@ -1046,31 +1032,65 @@ static struct SCH_LINE_DESC
{
SCH_LINE_DESC()
{
ENUM_MAP<LINE_STYLE>& plotDashTypeEnum = ENUM_MAP<LINE_STYLE>::Instance();
ENUM_MAP<LINE_STYLE>& lineStyleEnum = ENUM_MAP<LINE_STYLE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
if( lineStyleEnum.Choices().GetCount() == 0 )
{
plotDashTypeEnum.Map( LINE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
lineStyleEnum.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
ENUM_MAP<WIRE_STYLE>& wireLineStyleEnum = ENUM_MAP<WIRE_STYLE>::Instance();
if( wireLineStyleEnum.Choices().GetCount() == 0 )
{
wireLineStyleEnum.Map( WIRE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( WIRE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( WIRE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( WIRE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( WIRE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( WIRE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
REGISTER_TYPE( SCH_LINE );
propMgr.InheritsAfter( TYPE_HASH( SCH_LINE ), TYPE_HASH( SCH_ITEM ) );
void ( SCH_LINE::*lineStyleSetter )( LINE_STYLE ) = &SCH_LINE::SetLineStyle;
auto isGraphicLine =
[]( INSPECTABLE* aItem ) -> bool
{
if( SCH_LINE* line = dynamic_cast<SCH_LINE*>( aItem ) )
return line->IsGraphicLine();
return false;
};
auto isWireOrBus =
[]( INSPECTABLE* aItem ) -> bool
{
if( SCH_LINE* line = dynamic_cast<SCH_LINE*>( aItem ) )
return line->IsWire() || line->IsBus();
return false;
};
propMgr.AddProperty( new PROPERTY_ENUM<SCH_LINE, LINE_STYLE>( _HKI( "Line Style" ),
lineStyleSetter, &SCH_LINE::GetLineStyle ) );
&SCH_LINE::SetLineStyle, &SCH_LINE::GetLineStyle ) )
.SetAvailableFunc( isGraphicLine );
propMgr.AddProperty( new PROPERTY_ENUM<SCH_LINE, WIRE_STYLE>( _HKI( "Line Style" ),
&SCH_LINE::SetWireStyle, &SCH_LINE::GetWireStyle ) )
.SetAvailableFunc( isWireOrBus );
propMgr.AddProperty( new PROPERTY<SCH_LINE, int>( _HKI( "Line Width" ),
&SCH_LINE::SetLineWidth, &SCH_LINE::GetLineWidth, PROPERTY_DISPLAY::PT_SIZE ) );
&SCH_LINE::SetLineWidth, &SCH_LINE::GetLineWidth, PROPERTY_DISPLAY::PT_SIZE ) );
propMgr.AddProperty( new PROPERTY<SCH_LINE, COLOR4D>( _HKI( "Color" ),
&SCH_LINE::SetLineColor, &SCH_LINE::GetLineColor ) );
&SCH_LINE::SetLineColor, &SCH_LINE::GetLineColor ) );
}
} _SCH_LINE_DESC;
IMPLEMENT_ENUM_TO_WXANY( WIRE_STYLE )

16
eeschema/sch_line.h
View File

@ -163,13 +163,18 @@ public:
}
void SetLineStyle( const LINE_STYLE aStyle );
void SetLineStyle( const int aStyleId );
LINE_STYLE GetLineStyle() const;
LINE_STYLE GetLineStyle() const { return m_stroke.GetLineStyle(); }
/// @return the style that the line should be drawn in
/// this might be set on the line or inherited from the line's netclass
LINE_STYLE GetEffectiveLineStyle() const;
// Special Getter/Setters for properties panel. Required because it uses WIRE_STYLE instead
// of LINE_STYLE. (The two enums are identical, but we expose "default" in the WIRE_STYLE
// property while we don't with the LINE_STYLE property.)
void SetWireStyle( const WIRE_STYLE aStyle ) { SetLineStyle( (LINE_STYLE) aStyle ); }
WIRE_STYLE GetWireStyle() const { return (WIRE_STYLE) GetLineStyle(); }
void SetLineColor( const COLOR4D& aColor );
void SetLineColor( const double r, const double g, const double b, const double a );
@ -363,4 +368,9 @@ private:
};
#ifndef SWIG
DECLARE_ENUM_TO_WXANY( WIRE_STYLE );
#endif
#endif // _SCH_LINE_H_

2
eeschema/sch_painter.cpp
View File

@ -2851,7 +2851,7 @@ void SCH_PAINTER::draw( const SCH_BUS_ENTRY_BASE *aEntry, int aLayer )
else
{
line.SetLineColor( color );
line.SetLineStyle( aEntry->GetLineStyle() );
line.SetLineStyle( aEntry->GetEffectiveLineStyle() );
draw( &line, aLayer );
}

14
include/stroke_params.h
View File

@ -62,6 +62,20 @@ struct LINE_STYLE_DESC
};
// A cover of LINE_STYLE for the properties manager (so that it can have different
// strings from the normal LINE_STYLE)
enum class WIRE_STYLE
{
DEFAULT = -1,
SOLID = 0,
DASH,
DOT,
DASHDOT,
DASHDOTDOT
};
/**
* Conversion map between LINE_STYLE values and style names displayed.
*/

10
pcbnew/dialogs/dialog_shape_properties.cpp
View File

@ -1001,8 +1001,6 @@ DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_lineStyleCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_lineStyleCombo->Append( DEFAULT_STYLE );
m_LayerSelectionCtrl->SetLayersHotkeys( false );
m_LayerSelectionCtrl->SetBoardFrame( m_parent );
m_LayerSelectionCtrl->Resync();
@ -1112,12 +1110,10 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( m_item->GetStroke().GetLineStyle() );
if( style == -1 )
m_lineStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_lineStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_lineStyleCombo->SetSelection( 0 );
m_LayerSelectionCtrl->SetLayerSelection( m_item->GetLayer() );
@ -1170,7 +1166,7 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_lineStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

19
pcbnew/dialogs/dialog_table_properties.cpp
View File

@ -123,9 +123,6 @@ DIALOG_TABLE_PROPERTIES::DIALOG_TABLE_PROPERTIES( PCB_BASE_EDIT_FRAME* aFrame, P
m_separatorsStyleCombo->Append( lineStyleDesc.name, KiBitmap( lineStyleDesc.bitmap ) );
}
m_borderStyleCombo->Append( DEFAULT_STYLE );
m_separatorsStyleCombo->Append( DEFAULT_STYLE );
SetupStandardButtons();
Layout();
@ -211,12 +208,10 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataToWindow()
int style = static_cast<int>( m_table->GetBorderStroke().GetLineStyle() );
if( style == -1 )
m_borderStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_borderStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_borderStyleCombo->SetSelection( 0 );
m_borderWidth.Enable( m_table->StrokeExternal() || m_table->StrokeHeader() );
m_borderStyleLabel->Enable( m_table->StrokeExternal() || m_table->StrokeHeader() );
@ -233,12 +228,10 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataToWindow()
style = static_cast<int>( m_table->GetSeparatorsStroke().GetLineStyle() );
if( style == -1 )
m_separatorsStyleCombo->SetStringSelection( DEFAULT_STYLE );
else if( style < (int) lineTypeNames.size() )
if( style >= 0 && style < (int) lineTypeNames.size() )
m_separatorsStyleCombo->SetSelection( style );
else
wxFAIL_MSG( "Line type not found in the type lookup map" );
m_separatorsStyleCombo->SetSelection( 0 );
m_separatorsWidth.Enable( rows || cols );
m_separatorsStyleLabel->Enable( rows || cols );
@ -339,7 +332,7 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_borderStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );
@ -360,7 +353,7 @@ bool DIALOG_TABLE_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_separatorsStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

4
pcbnew/dialogs/dialog_textbox_properties.cpp
View File

@ -130,8 +130,6 @@ DIALOG_TEXTBOX_PROPERTIES::DIALOG_TEXTBOX_PROPERTIES( PCB_BASE_EDIT_FRAME* aPare
for( const auto& [ lineStyle, lineStyleDesc ] : lineTypeNames )
m_borderStyleCombo->Append( lineStyleDesc.name, KiBitmapBundle( lineStyleDesc.bitmap ) );
m_borderStyleCombo->Append( DEFAULT_STYLE );
SetupStandardButtons();
// wxTextCtrls fail to generate wxEVT_CHAR events when the wxTE_MULTILINE flag is set,
@ -369,7 +367,7 @@ bool DIALOG_TEXTBOX_PROPERTIES::TransferDataFromWindow()
std::advance( it, m_borderStyleCombo->GetSelection() );
if( it == lineTypeNames.end() )
stroke.SetLineStyle( LINE_STYLE::DEFAULT );
stroke.SetLineStyle( LINE_STYLE::SOLID );
else
stroke.SetLineStyle( it->first );

15
pcbnew/pcb_table.cpp
View File

@ -526,16 +526,15 @@ static struct PCB_TABLE_DESC
{
PCB_TABLE_DESC()
{
ENUM_MAP<LINE_STYLE>& plotDashTypeEnum = ENUM_MAP<LINE_STYLE>::Instance();
ENUM_MAP<LINE_STYLE>& lineStyleEnum = ENUM_MAP<LINE_STYLE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
if( lineStyleEnum.Choices().GetCount() == 0 )
{
plotDashTypeEnum.Map( LINE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
lineStyleEnum.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();

15
pcbnew/pcb_textbox.cpp
View File

@ -788,16 +788,15 @@ static struct PCB_TEXTBOX_DESC
{
PCB_TEXTBOX_DESC()
{
ENUM_MAP<LINE_STYLE>& plotDashTypeEnum = ENUM_MAP<LINE_STYLE>::Instance();
ENUM_MAP<LINE_STYLE>& lineStyleEnum = ENUM_MAP<LINE_STYLE>::Instance();
if( plotDashTypeEnum.Choices().GetCount() == 0 )
if( lineStyleEnum.Choices().GetCount() == 0 )
{
plotDashTypeEnum.Map( LINE_STYLE::DEFAULT, _HKI( "Default" ) )
.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
lineStyleEnum.Map( LINE_STYLE::SOLID, _HKI( "Solid" ) )
.Map( LINE_STYLE::DASH, _HKI( "Dashed" ) )
.Map( LINE_STYLE::DOT, _HKI( "Dotted" ) )
.Map( LINE_STYLE::DASHDOT, _HKI( "Dash-Dot" ) )
.Map( LINE_STYLE::DASHDOTDOT, _HKI( "Dash-Dot-Dot" ) );
}
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();

2
pcbnew/widgets/pcb_properties_panel.cpp
View File

@ -273,7 +273,7 @@ void PCB_PROPERTIES_PANEL::updateLists( const BOARD* aBoard )
auto netProperty = m_propMgr.GetProperty( TYPE_HASH( BOARD_CONNECTED_ITEM ), _HKI( "Net" ) );
netProperty->SetChoices( nets );
// Regnerate font names
// Regenerate font names
std::vector<std::string> fontNames;
Fontconfig()->ListFonts( fontNames, std::string( Pgm().GetLanguageTag().utf8_str() ),
aBoard->GetFontFiles() );